Demo scene done

Ovidiu Arion · Ovidiu Arion · commit fc9f1a8e6bbc · 2022-09-27T12:33:01.000+03:00
diff --git a/Assets/ElrondUnityTools/Example/Scripts/ConnectedScreen.cs b/Assets/ElrondUnityTools/Example/Scripts/ConnectedScreen.cs
@@ -28,12 +28,14 @@ private void RefreshAccount(AccountDto connectedAccount)
             ht.text = "HT: " + connectedAccount.Username;
         }
 
+
+        //linked to the UI button to open the Transactions screen
         public void ShowTransactions()
         {
             DemoScript.Instance.LoadScreen(Screens.Transactions);
         }
 
-        //linked to a button to open the SC screen
+        //linked to the UI button to open the SC screen
         public void ShowSCScreen()
         {
             DemoScript.Instance.LoadScreen(Screens.SC);
diff --git a/Assets/ElrondUnityTools/Example/Scripts/GenericUIScreen.cs b/Assets/ElrondUnityTools/Example/Scripts/GenericUIScreen.cs
@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
 namespace ElrondUnityExamples
diff --git a/Assets/ElrondUnityTools/Example/Scripts/HomeScreen.cs b/Assets/ElrondUnityTools/Example/Scripts/HomeScreen.cs
@@ -1,7 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
 namespace ElrondUnityExamples
 {
     public class HomeScreen : GenericUIScreen
diff --git a/Assets/ElrondUnityTools/Example/Scripts/LoginScreen.cs b/Assets/ElrondUnityTools/Example/Scripts/LoginScreen.cs
@@ -1,8 +1,3 @@
-using Erdcsharp.Domain;
-using Erdcsharp.Provider.Dtos;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
 using UnityEngine.UI;
 
 namespace ElrondUnityExamples
diff --git a/Assets/ElrondUnityTools/Example/Scripts/NftsScreen.cs b/Assets/ElrondUnityTools/Example/Scripts/NftsScreen.cs
@@ -1,11 +1,7 @@
 using ElrondUnityTools;
-using System;
-using System.Collections;
 using System.Linq;
 using UnityEngine;
-using UnityEngine.Networking;
 using UnityEngine.UI;
-using Image = UnityEngine.UI.Image;
 
 namespace ElrondUnityExamples
 {
@@ -78,8 +74,6 @@ private void DisplayNft(NFTMetadata nFTMetadata)
         }
 
 
-
-
         /// <summary>
         /// Refresh the wallet NFTs after sending an NFT
         /// </summary>
diff --git a/Assets/ElrondUnityTools/Example/Scripts/SCScreen.cs b/Assets/ElrondUnityTools/Example/Scripts/SCScreen.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -132,8 +130,8 @@ private void SCTransactionListener(ElrondUnityTools.OperationStatus operationSta
                     if (message == "success")
                     {
                         //do something 
-                        ElrondUnityTools.Manager.RefreshAccount();
                     }
+                    ElrondUnityTools.Manager.RefreshAccount();
                 }
             }
         }
diff --git a/Assets/ElrondUnityTools/Example/Scripts/TokenHolder.cs b/Assets/ElrondUnityTools/Example/Scripts/TokenHolder.cs
@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 
diff --git a/Assets/ElrondUnityTools/Example/Scripts/TransactionsScreen.cs b/Assets/ElrondUnityTools/Example/Scripts/TransactionsScreen.cs
@@ -1,6 +1,4 @@
 using ElrondUnityTools;
-using Erdcsharp.Domain;
-using System;
 using System.Numerics;
 using UnityEngine;
 using UnityEngine.UI;
@@ -30,7 +28,7 @@ public override void Init(params object[] args)
             base.Init(args);
             destination.text = defaultAddress;
             message.text = defaultMessage;
-            amount.text = esdtAmount.text = egld.ToString();
+            amount.text = egld.ToString();
             PopulateDropDown();
             status.text = "Start loading tokens";
             Manager.LoadAllTokens(TokensLoaded);
@@ -155,10 +153,9 @@ private void BlockchainTransactionListener(ElrondUnityTools.OperationStatus oper
                 {
                     if (message == "success")
                     {
-                        ElrondUnityTools.Manager.RefreshAccount(RefreshDone);
                         status.text = "Success -> Refreshing tokens";
-
                     }
+                    ElrondUnityTools.Manager.RefreshAccount(RefreshDone);
                 }
             }
         }
diff --git a/Assets/ElrondUnityTools/Scripts/ConnectionManager.cs b/Assets/ElrondUnityTools/Scripts/ConnectionManager.cs
@@ -285,7 +285,6 @@ private void AccountRefreshed()
         public async void RefreshAccount(UnityAction CompleteMethod)
         {
             connectedAccount = await provider.GetAccount(WalletConnect.ActiveSession.Accounts[0]);
-            Debug.LogWarning(connectedAccount.Nonce);
             if (CompleteMethod != null)
             {
                 CompleteMethod();
@@ -295,7 +294,6 @@ public async void RefreshAccount(UnityAction CompleteMethod)
 
         private void ActiveSessionOnDisconnect(object sender, EventArgs e)
         {
-            Debug.Log("ActiveSessionOnDisconnect");
             WalletConnect.ActiveSession.OnSessionDisconnect -= ActiveSessionOnDisconnect;
             walletConnected = false;
             OnWalletDisconnected();
@@ -383,7 +381,6 @@ private IEnumerator GetWalletNFTs(string address, UnityAction<OperationStatus, s
                 {
                     case UnityWebRequest.Result.Success:
                         totalNfts = int.Parse(webRequest.downloadHandler.text);
-                        Debug.Log(totalNfts);
                         break;
                     default:
                         LoadNFTsComplete(OperationStatus.Error, webRequest.error, null);
diff --git a/Assets/ElrondUnityTools/Scripts/ESDTToken.cs b/Assets/ElrondUnityTools/Scripts/ESDTToken.cs
@@ -23,7 +23,7 @@ public ESDTToken(string name, string identifier, int decimals)
 
         public Token ToToken()
         {
-            return new Token(name, "AAA", decimals);
+            return new Token(name, identifier.Split("-")[0], decimals);
         }
     }
 }
diff --git a/Assets/ElrondUnityTools/Scripts/Manager.cs b/Assets/ElrondUnityTools/Scripts/Manager.cs
@@ -158,17 +158,31 @@ public static void PostRequest(string url, string jsonData, UnityAction<Operatio
         }
 
 
+        /// <summary>
+        /// Refresh the account balance and nonce
+        /// </summary>
+        /// <param name="CompleteMethod"></param>
         public static void RefreshAccount(UnityAction CompleteMethod = null)
         {
             ConnectionManager.Instance.RefreshAccount(CompleteMethod);
         }
 
 
+        /// <summary>
+        /// Load all ESDT tokens from an account
+        /// </summary>
+        /// <param name="LoadTokensComplete">Callback triggered on load finish</param>
         public static void LoadAllTokens(UnityAction<OperationStatus, string, TokenMetadata[]> LoadTokensComplete)
         {
             ConnectionManager.Instance.LoadAllTokens(LoadTokensComplete);
         }
 
+
+        /// <summary>
+        /// Load an image from and URL and display it directly on an image component when loaded
+        /// </summary>
+        /// <param name="imageURL">url to download image from</param>
+        /// <param name="displayComponent">the image component to display the picture</param>
         public static void LoadImage(string imageURL, Image displayComponent)
         {
             ConnectionManager.Instance.LoadImage(imageURL, displayComponent);
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: ChainOfIndustry
-  productName: Elrond Unity Development Tools
+  productName: Elrond Unity Tools
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -134,7 +134,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.1.0
+  bundleVersion: 0.2.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -156,7 +156,7 @@ PlayerSettings:
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
     Android: com.ChainOfIndustry.ElrondUnityDevelopmentTools
-    Standalone: com.ChainOfIndustry.Elrond-Unity-Development-Tools
+    Standalone: com.ChainOfIndustry.Elrond-Unity-Tools
   buildNumber:
     Standalone: 0
     iPhone: 0

Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,14 @@ private void RefreshAccount(AccountDto connectedAccount)`
`28`	`28`	`ht.text = "HT: " + connectedAccount.Username;`
`29`	`29`	`}`
`30`	`30`
	`31`	`+`
	`32`	`+ //linked to the UI button to open the Transactions screen`
`31`	`33`	`public void ShowTransactions()`
`32`	`34`	`{`
`33`	`35`	`DemoScript.Instance.LoadScreen(Screens.Transactions);`
`34`	`36`	`}`
`35`	`37`
`36`		`- //linked to a button to open the SC screen`
	`38`	`+ //linked to the UI button to open the SC screen`
`37`	`39`	`public void ShowSCScreen()`
`38`	`40`	`{`
`39`	`41`	`DemoScript.Instance.LoadScreen(Screens.SC);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-using System.Collections;`
`2`		`-using System.Collections.Generic;`
`3`	`1`	`using UnityEngine;`
`4`	`2`
`5`	`3`	`namespace ElrondUnityExamples`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,3 @@`
`1`		`-using System.Collections;`
`2`		`-using System.Collections.Generic;`
`3`		`-using UnityEngine;`
`4`		`-`
`5`	`1`	`namespace ElrondUnityExamples`
`6`	`2`	`{`
`7`	`3`	`public class HomeScreen : GenericUIScreen`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections;`
`3`		`-using System.Collections.Generic;`
`4`	`2`	`using UnityEngine;`
`5`	`3`	`using UnityEngine.UI;`
`6`	`4`
`@@ -132,8 +130,8 @@ private void SCTransactionListener(ElrondUnityTools.OperationStatus operationSta`
`132`	`130`	`if (message == "success")`
`133`	`131`	`{`
`134`	`132`	`//do something`
`135`		`- ElrondUnityTools.Manager.RefreshAccount();`
`136`	`133`	`}`
	`134`	`+ ElrondUnityTools.Manager.RefreshAccount();`
`137`	`135`	`}`
`138`	`136`	`}`
`139`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`using ElrondUnityTools;`
`2`		`-using Erdcsharp.Domain;`
`3`		`-using System;`
`4`	`2`	`using System.Numerics;`
`5`	`3`	`using UnityEngine;`
`6`	`4`	`using UnityEngine.UI;`
`@@ -30,7 +28,7 @@ public override void Init(params object[] args)`
`30`	`28`	`base.Init(args);`
`31`	`29`	`destination.text = defaultAddress;`
`32`	`30`	`message.text = defaultMessage;`
`33`		`- amount.text = esdtAmount.text = egld.ToString();`
	`31`	`+ amount.text = egld.ToString();`
`34`	`32`	`PopulateDropDown();`
`35`	`33`	`status.text = "Start loading tokens";`
`36`	`34`	`Manager.LoadAllTokens(TokensLoaded);`
`@@ -155,10 +153,9 @@ private void BlockchainTransactionListener(ElrondUnityTools.OperationStatus oper`
`155`	`153`	`{`
`156`	`154`	`if (message == "success")`
`157`	`155`	`{`
`158`		`- ElrondUnityTools.Manager.RefreshAccount(RefreshDone);`
`159`	`156`	`status.text = "Success -> Refreshing tokens";`
`160`		`-`
`161`	`157`	`}`
	`158`	`+ ElrondUnityTools.Manager.RefreshAccount(RefreshDone);`
`162`	`159`	`}`
`163`	`160`	`}`
`164`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,6 @@ private void AccountRefreshed()`
`285`	`285`	`public async void RefreshAccount(UnityAction CompleteMethod)`
`286`	`286`	`{`
`287`	`287`	`connectedAccount = await provider.GetAccount(WalletConnect.ActiveSession.Accounts[0]);`
`288`		`- Debug.LogWarning(connectedAccount.Nonce);`
`289`	`288`	`if (CompleteMethod != null)`
`290`	`289`	`{`
`291`	`290`	`CompleteMethod();`
`@@ -295,7 +294,6 @@ public async void RefreshAccount(UnityAction CompleteMethod)`
`295`	`294`
`296`	`295`	`private void ActiveSessionOnDisconnect(object sender, EventArgs e)`
`297`	`296`	`{`
`298`		`- Debug.Log("ActiveSessionOnDisconnect");`
`299`	`297`	`WalletConnect.ActiveSession.OnSessionDisconnect -= ActiveSessionOnDisconnect;`
`300`	`298`	`walletConnected = false;`
`301`	`299`	`OnWalletDisconnected();`
`@@ -383,7 +381,6 @@ private IEnumerator GetWalletNFTs(string address, UnityAction<OperationStatus, s`
`383`	`381`	`{`
`384`	`382`	`case UnityWebRequest.Result.Success:`
`385`	`383`	`totalNfts = int.Parse(webRequest.downloadHandler.text);`
`386`		`- Debug.Log(totalNfts);`
`387`	`384`	`break;`
`388`	`385`	`default:`
`389`	`386`	`LoadNFTsComplete(OperationStatus.Error, webRequest.error, null);`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public ESDTToken(string name, string identifier, int decimals)`
`23`	`23`
`24`	`24`	`public Token ToToken()`
`25`	`25`	`{`
`26`		`- return new Token(name, "AAA", decimals);`
	`26`	`+ return new Token(name, identifier.Split("-")[0], decimals);`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`}`