Fixed merge

Guillemsc · Guillemsc · commit e9b28d621758 · 2022-06-02T22:34:54.000+02:00
diff --git a/Editor/Localization/Configuration/LocalizationToolConfigurationEditor.cs b/Editor/Localization/Configuration/LocalizationToolConfigurationEditor.cs
@@ -1,7 +1,7 @@
-﻿using Juce.Loc.Dawers;
+﻿using Juce.Localization.Dawers;
 using UnityEditor;
 
-namespace Juce.Loc.Configuration
+namespace Juce.Localization.Configuration
 {
     [CustomEditor(typeof(LocalizationToolConfiguration))]
     public class LocalizationToolConfigurationEditor : Editor
diff --git a/Editor/Localization/Constants/ConstantEditorDirectories.cs b/Editor/Localization/Constants/ConstantEditorDirectories.cs
@@ -1,6 +1,6 @@
 ﻿using UnityEngine;
 
-namespace Juce.Loc.Constants
+namespace Juce.Localization.Constants
 {
     public static class ConstantEditorDirectories
     {
diff --git a/Editor/Localization/Constants/ConstantGoogleSpreadsheetScopes.cs b/Editor/Localization/Constants/ConstantGoogleSpreadsheetScopes.cs
@@ -1,6 +1,6 @@
 ﻿using Google.Apis.Sheets.v4;
 
-namespace Juce.Loc.Constants
+namespace Juce.Localization.Constants
 {
     public static class ConstantGoogleSpreadsheetScopes
     {
diff --git a/Editor/Localization/Constants/ConstantNames.cs b/Editor/Localization/Constants/ConstantNames.cs
@@ -1,4 +1,4 @@
-﻿namespace Juce.Loc.Constants
+﻿namespace Juce.Localization.Constants
 {
     public static class ConstantNames
     {
diff --git a/Editor/Localization/Drawers/RefreshButtonDrawer.cs b/Editor/Localization/Drawers/RefreshButtonDrawer.cs
@@ -1,12 +1,12 @@
 ﻿using Google.Apis.Sheets.v4.Data;
-using Juce.Loc.Configuration;
-using Juce.Loc.Data;
-using Juce.Loc.Results;
+using Juce.Core.Results;
+using Juce.Localization.Configuration;
+using Juce.Localization.Data;
 using System.Collections.Generic;
 using System.Threading;
 using UnityEngine;
 
-namespace Juce.Loc.Dawers
+namespace Juce.Localization.Dawers
 {
     public static class RefreshButtonDrawer
     {
diff --git a/Editor/Localization/Queries/GenerateLocalizationDataFromGoogleSpreadsheetQuery.cs b/Editor/Localization/Queries/GenerateLocalizationDataFromGoogleSpreadsheetQuery.cs
@@ -1,11 +1,10 @@
 ﻿using Google.Apis.Sheets.v4.Data;
-using Juce.Loc.Configuration;
-using Juce.Loc.Constants;
-using Juce.Loc.Data;
-using Juce.Loc.Results;
+using Juce.Core.Results;
+using Juce.Localization.Configuration;
+using Juce.Localization.Data;
 using System.Collections.Generic;
 
-namespace Juce.Loc.Dawers
+namespace Juce.Localization.Dawers
 {
     public static class GenerateLocalizationDataFromGoogleSpreadsheetQuery
     {
diff --git a/Editor/Localization/Queries/SaveLocalizationDataToDiskQuery.cs b/Editor/Localization/Queries/SaveLocalizationDataToDiskQuery.cs
@@ -1,5 +1,5 @@
-﻿using Juce.Loc.Constants;
-using Juce.Loc.Data;
+﻿using Juce.Localization.Constants;
+using Juce.Localization.Data;
 using Newtonsoft.Json;
 using System;
 using System.IO;
@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using UnityEditor;
 
-namespace Juce.Loc.Dawers
+namespace Juce.Localization.Dawers
 {
     public static class SaveLocalizationDataToDiskQuery
     {
diff --git a/Editor/Localization/Queries/TryDownloadSpreadsheetFromGoogleQuery.cs b/Editor/Localization/Queries/TryDownloadSpreadsheetFromGoogleQuery.cs
@@ -1,13 +1,13 @@
 ﻿using Google.Apis.Sheets.v4;
 using Google.Apis.Sheets.v4.Data;
-using Juce.Loc.Configuration;
-using Juce.Loc.Results;
+using Juce.Core.Results;
+using Juce.Localization.Configuration;
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Juce.Loc.Dawers
+namespace Juce.Localization.Dawers
 {
     public static class TryDownloadSpreadsheetFromGoogleQuery
     {
@@ -28,7 +28,7 @@ out SheetsService sheetsService
             if(!serviceFound)
             {
                 UnityEngine.Debug.Log($"Query can't continue, Sheets Service not found");
-                return TaskResult<List<ValueRange>>.FromError();
+                return TaskResult<List<ValueRange>>.FromEmpty();
             }
 
             UnityEngine.Debug.Log($"2.Downloading spreadsheets...");
@@ -46,13 +46,13 @@ out SheetsService sheetsService
             catch (Exception exception)
             {
                 UnityEngine.Debug.Log($"There was an error downloading spreadsheet: {exception.Message}");
-                return TaskResult<List<ValueRange>>.FromError();
+                return TaskResult<List<ValueRange>>.FromEmpty();
             }
 
             if(spreadSheetData == null)
             {
                 UnityEngine.Debug.Log($"Query can't continue, spreadsheets could not be found");
-                return TaskResult<List<ValueRange>>.FromError();
+                return TaskResult<List<ValueRange>>.FromEmpty();
             }
 
             UnityEngine.Debug.Log($"3.Spreadsheet downloaded: {spreadSheetData.Properties.Title}");
diff --git a/Editor/Localization/Queries/TryGetSheetsServiceFromCredentials.cs b/Editor/Localization/Queries/TryGetSheetsServiceFromCredentials.cs
@@ -1,11 +1,11 @@
 ﻿using Google.Apis.Auth.OAuth2;
 using Google.Apis.Services;
 using Google.Apis.Sheets.v4;
-using Juce.Loc.Configuration;
+using Juce.Localization.Configuration;
 using System.IO;
 using static Google.Apis.Auth.OAuth2.ServiceAccountCredential;
 
-namespace Juce.Loc.Dawers
+namespace Juce.Localization.Dawers
 {
 	public static class TryGetSheetsServiceFromCredentials
 	{
diff --git a/Runtime/Localization/Configuration/LocalizationToolConfiguration.cs b/Runtime/Localization/Configuration/LocalizationToolConfiguration.cs
@@ -1,6 +1,6 @@
 ﻿using UnityEngine;
 
-namespace Juce.Loc.Configuration
+namespace Juce.Localization.Configuration
 {
     [CreateAssetMenu(fileName = nameof(LocalizationToolConfiguration), 
         menuName = "Juce/Localization/" + nameof(LocalizationToolConfiguration), order = 1)]
diff --git a/Runtime/Localization/Constants/ConstantDirectories.cs b/Runtime/Localization/Constants/ConstantDirectories.cs
@@ -1,4 +1,4 @@
-﻿namespace Juce.Loc.Constants
+﻿namespace Juce.Localization.Constants
 {
     public static class ConstantDirectories
     {
diff --git a/Runtime/Localization/Data/LanguageLocalizationData.cs b/Runtime/Localization/Data/LanguageLocalizationData.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Juce.Loc.Data
+namespace Juce.Localization.Data
 {
     public class LanguageLocalizationData 
     {
diff --git a/Runtime/Localization/Data/LocalizationData.cs b/Runtime/Localization/Data/LocalizationData.cs
@@ -1,6 +1,6 @@
 ﻿using System.Collections.Generic;
 
-namespace Juce.Loc.Data
+namespace Juce.Localization.Data
 {
     public class LocalizationData 
     {
diff --git a/Runtime/Localization/Loading/LoadLocalizationDataRequest.cs b/Runtime/Localization/Loading/LoadLocalizationDataRequest.cs
@@ -1,12 +1,12 @@
-﻿using Juce.Loc.Constants;
-using Juce.Loc.Data;
-using Juce.Loc.Results;
+﻿using Juce.Core.Results;
+using Juce.Localization.Constants;
+using Juce.Localization.Data;
 using Newtonsoft.Json;
 using System;
 using System.Threading.Tasks;
 using UnityEngine;
 
-namespace Juce.Loc.Requests
+namespace Juce.Localization.Requests
 {
     public static class LoadLocalizationDataRequest
     {
@@ -16,7 +16,7 @@ public static async Task<TaskResult<LocalizationData>> Execute()
 
             if (resourceRequest == null)
             {
-                return TaskResult<LocalizationData>.FromError();
+                return TaskResult<LocalizationData>.FromEmpty();
             }
 
             TaskCompletionSource<bool> taskCompletitionSource = new TaskCompletionSource<bool>();
@@ -33,7 +33,7 @@ public static async Task<TaskResult<LocalizationData>> Execute()
 
             if (textAsset == null)
             {
-                return TaskResult<LocalizationData>.FromError();
+                return TaskResult<LocalizationData>.FromEmpty();
             }
 
             LocalizationData localizationData;
@@ -48,7 +48,7 @@ public static async Task<TaskResult<LocalizationData>> Execute()
                     $"at {nameof(LoadLocalizationDataRequest)}, " +
                     $"with the exception {exception.Message}");
 
-                return TaskResult<LocalizationData>.FromError();
+                return TaskResult<LocalizationData>.FromEmpty();
             }
 
             return TaskResult<LocalizationData>.FromResult(localizationData);
diff --git a/Runtime/Localization/Results.meta b/Runtime/Localization/Results.meta
diff --git a/Runtime/Localization/Results/TaskResult.cs b/Runtime/Localization/Results/TaskResult.cs
diff --git a/Runtime/Localization/Results/TaskResult.cs.meta b/Runtime/Localization/Results/TaskResult.cs.meta
diff --git a/Runtime/Localization/Services/ILocalizationService.cs b/Runtime/Localization/Services/ILocalizationService.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Juce.Loc.Services
+namespace Juce.Localization.Services
 {
     public interface ILocalizationService
     {
diff --git a/Runtime/Localization/Services/LocalizationService.cs b/Runtime/Localization/Services/LocalizationService.cs
@@ -1,11 +1,11 @@
-﻿using Juce.Loc.Data;
-using Juce.Loc.Requests;
-using Juce.Loc.Results;
+﻿using Juce.Core.Results;
+using Juce.Localization.Data;
+using Juce.Localization.Requests;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Juce.Loc.Services
+namespace Juce.Localization.Services
 {
     public class LocalizationService : ILocalizationService
     {
diff --git a/Runtime/Localization/TextProcessorLayers/LocalizationTextProcessorLayer.cs b/Runtime/Localization/TextProcessorLayers/LocalizationTextProcessorLayer.cs
@@ -1,6 +1,6 @@
 ﻿using Juce.CoreUnity.Service;
 using Juce.CoreUnity.TextProcessors;
-using Juce.Loc.Services;
+using Juce.Localization.Services;
 using UnityEngine;
 
 namespace Juce.CoreUnity.Localization.TextProcessorLayers

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using Juce.Loc.Dawers;`
	`1`	`+using Juce.Localization.Dawers;`
`2`	`2`	`using UnityEditor;`
`3`	`3`
`4`		`-namespace Juce.Loc.Configuration`
	`4`	`+namespace Juce.Localization.Configuration`
`5`	`5`	`{`
`6`	`6`	`[CustomEditor(typeof(LocalizationToolConfiguration))]`
`7`	`7`	`public class LocalizationToolConfigurationEditor : Editor`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using UnityEngine;`
`2`	`2`
`3`		`-namespace Juce.Loc.Constants`
	`3`	`+namespace Juce.Localization.Constants`
`4`	`4`	`{`
`5`	`5`	`public static class ConstantEditorDirectories`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Google.Apis.Sheets.v4;`
`2`	`2`
`3`		`-namespace Juce.Loc.Constants`
	`3`	`+namespace Juce.Localization.Constants`
`4`	`4`	`{`
`5`	`5`	`public static class ConstantGoogleSpreadsheetScopes`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Juce.Loc.Constants`
	`1`	`+namespace Juce.Localization.Constants`
`2`	`2`	`{`
`3`	`3`	`public static class ConstantNames`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`using Google.Apis.Sheets.v4;`
`2`	`2`	`using Google.Apis.Sheets.v4.Data;`
`3`		`-using Juce.Loc.Configuration;`
`4`		`-using Juce.Loc.Results;`
	`3`	`+using Juce.Core.Results;`
	`4`	`+using Juce.Localization.Configuration;`
`5`	`5`	`using System;`
`6`	`6`	`using System.Collections.Generic;`
`7`	`7`	`using System.Threading;`
`8`	`8`	`using System.Threading.Tasks;`
`9`	`9`
`10`		`-namespace Juce.Loc.Dawers`
	`10`	`+namespace Juce.Localization.Dawers`
`11`	`11`	`{`
`12`	`12`	`public static class TryDownloadSpreadsheetFromGoogleQuery`
`13`	`13`	`{`
`@@ -28,7 +28,7 @@ out SheetsService sheetsService`
`28`	`28`	`if(!serviceFound)`
`29`	`29`	`{`
`30`	`30`	`UnityEngine.Debug.Log($"Query can't continue, Sheets Service not found");`
`31`		`- return TaskResult<List<ValueRange>>.FromError();`
	`31`	`+ return TaskResult<List<ValueRange>>.FromEmpty();`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`UnityEngine.Debug.Log($"2.Downloading spreadsheets...");`
`@@ -46,13 +46,13 @@ out SheetsService sheetsService`
`46`	`46`	`catch (Exception exception)`
`47`	`47`	`{`
`48`	`48`	`UnityEngine.Debug.Log($"There was an error downloading spreadsheet: {exception.Message}");`
`49`		`- return TaskResult<List<ValueRange>>.FromError();`
	`49`	`+ return TaskResult<List<ValueRange>>.FromEmpty();`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`if(spreadSheetData == null)`
`53`	`53`	`{`
`54`	`54`	`UnityEngine.Debug.Log($"Query can't continue, spreadsheets could not be found");`
`55`		`- return TaskResult<List<ValueRange>>.FromError();`
	`55`	`+ return TaskResult<List<ValueRange>>.FromEmpty();`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`UnityEngine.Debug.Log($"3.Spreadsheet downloaded: {spreadSheetData.Properties.Title}");`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`using Google.Apis.Auth.OAuth2;`
`2`	`2`	`using Google.Apis.Services;`
`3`	`3`	`using Google.Apis.Sheets.v4;`
`4`		`-using Juce.Loc.Configuration;`
	`4`	`+using Juce.Localization.Configuration;`
`5`	`5`	`using System.IO;`
`6`	`6`	`using static Google.Apis.Auth.OAuth2.ServiceAccountCredential;`
`7`	`7`
`8`		`-namespace Juce.Loc.Dawers`
	`8`	`+namespace Juce.Localization.Dawers`
`9`	`9`	`{`
`10`	`10`	`public static class TryGetSheetsServiceFromCredentials`
`11`	`11`	`{`