View layout customization

Author: skibitsky

Packages/com.walletconnect.web3modal/Resources/WalletConnect/Web3Modal/Components/Modal/Modal.uss

@@ -12,7 +12,7 @@
 
 .modal--type-mobile {
     position: absolute;
-    max-height: 90%;
+    max-height: var(--wui-modal-max-height-mobile);
     bottom: 0;
     left: 0;
     right: 0;
@@ -22,7 +22,7 @@
 
 .modal--type-desktop {
     align-self: center;
-    width: 360px;
+    width: var(--wui-modal-width-desktop);
 }
 
 #modal__body {

Packages/com.walletconnect.web3modal/Runtime/Presenters/DeepLinkPresenter.cs

@@ -19,6 +19,7 @@ public class DeepLinkPresenter : Presenter<DeepLinkView>
         private string _continueInText;
         private bool _isLoadingDeepLink;
         private Coroutine _loadingCoroutine;
+        private bool _disposed;
 
         private const string ContinueInTextTemplate = "Continue in {0}";
 
@@ -129,5 +130,29 @@ private IEnumerator LoadingRoutine()
             StopLoadingCoroutine();
         }
 #endif
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_disposed)
+                return;
+
+            if (disposing)
+            {
+#if UNITY_IOS || UNITY_ANDROID
+                if (_isLoadingDeepLink)
+                {
+                    StopLoadingCoroutine();
+                }
+#endif
+
+                _connectionProposal?.Dispose();
+
+                View.CopyLinkClicked -= OnCopyLinkClicked;
+                View.TryAgainLinkClicked -= OnTryAgainLinkClicked;
+            }
+
+            _disposed = true;
+            base.Dispose(disposing);
+        }
     }
 }

Packages/com.walletconnect.web3modal/Runtime/Presenters/ModalHeaderPresenter.cs

@@ -14,6 +14,7 @@ public class ModalHeaderPresenter : Presenter<ModalHeader>
         private readonly Dictionary<ViewType, VisualElement> _leftSlotItems = new();
 
         private Coroutine _snackbarCoroutine;
+        private bool _disposed;
 
         public ModalHeaderPresenter(RouterController routerController, Modal parent) : base(routerController, parent)
         {
@@ -123,5 +124,21 @@ private void ViewChangedHandler(object _, ViewChangedEventArgs args)
                     ? 1
                     : 0;
         }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_disposed)
+                return;
+
+            if (disposing)
+            {
+                Router.ViewChanged -= ViewChangedHandler;
+                Web3Modal.NotificationController.Notification -= NotificationHandler;
+                Web3Modal.ModalController.OpenStateChanged -= ModalOpenStateChangedHandler;
+            }
+
+            _disposed = true;
+            base.Dispose(disposing);
+        }
     }
 }

Packages/com.walletconnect.web3modal/Runtime/Presenters/NetworkSearchPresenter.cs

@@ -20,6 +20,7 @@ public override string Title
 
         private readonly Dictionary<string, CardSelect> _netowrkItems = new();
         private string _highlightedChainId;
+        private bool _disposed;
 
         public NetworkSearchPresenter(RouterController router, VisualElement parent) : base(router, parent)
         {
@@ -140,5 +141,19 @@ private void ConfigureItemPaddings(IList<VisualElement> items = null)
                 item.style.paddingRight = padding;
             }
         }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_disposed)
+                return;
+
+            if (disposing)
+            {
+                Web3Modal.NetworkController.ChainChanged += ChainChangedHandler;
+            }
+
+            _disposed = true;
+            base.Dispose(disposing);
+        }
     }
 }

Packages/com.walletconnect.web3modal/Runtime/Presenters/Presenter.cs

@@ -79,6 +79,8 @@ protected virtual void Dispose(bool disposing)
 
         protected VisualElement Parent { get; }
 
+        private bool _disposed;
+
         public override VisualElement ViewVisualElement
         {
             get => View;
@@ -114,5 +116,20 @@ protected override void OnHideCore()
         protected override void OnDisableCore()
         {
         }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_disposed)
+                return;
+
+            if (disposing)
+            {
+                if (View != null)
+                    Parent.Remove(View);
+            }
+
+            _disposed = true;
+            base.Dispose(disposing);
+        }
     }
 }

Packages/com.walletconnect.web3modal/Runtime/Views/AccountView/AccountView.cs

@@ -15,7 +15,7 @@ public class AccountView : VisualElement
         public static readonly string NameExplorerButton = $"{Name}__explorer-button";
         public static readonly string NameCopyLink = $"{Name}__profile-address-copy-link";
         public static readonly string NameButtons = $"{Name}__buttons";
-        
+
         public VisualElement Profile { get; }
         public Label ProfileAddress { get; }
         public Image ProfileAvatarImage { get; }
@@ -24,19 +24,23 @@ public class AccountView : VisualElement
         public Button ExplorerButton { get; }
         public IconLink CopyLink { get; }
         public VisualElement Buttons { get; }
-        
-        
+
+
         public new class UxmlFactory : UxmlFactory<AccountView>
         {
         }
 
-        public AccountView()
+        public AccountView() : this(null)
+        {
+        }
+
+        public AccountView(string visualTreePath)
         {
-            var asset = Resources.Load<VisualTreeAsset>("WalletConnect/Web3Modal/Views/AccountView/AccountView");
+            var asset = Resources.Load<VisualTreeAsset>(visualTreePath ?? "WalletConnect/Web3Modal/Views/AccountView/AccountView");
             asset.CloneTree(this);
 
             name = Name;
-            
+
             Profile = this.Q<VisualElement>(NameProfile);
             ProfileAddress = Profile.Q<Label>(NameProfileAddress);
             ProfileAvatarImage = Profile.Q<Image>(NameProfileAvatarImage);
@@ -56,7 +60,7 @@ public void SetBalance(string value)
         {
             ProfileBalanceValue.text = value.FontWeight500();
         }
-        
+
         public void SetBalanceSymbol(string value)
         {
             ProfileBalanceSymbol.text = value.FontWeight500();

Packages/com.walletconnect.web3modal/Runtime/Views/DeepLinkView/DeepLinkView.cs

@@ -43,9 +43,13 @@ public event Action TryAgainLinkClicked
         {
         }
 
-        public DeepLinkView()
+        public DeepLinkView() : this(null)
         {
-            var asset = Resources.Load<VisualTreeAsset>("WalletConnect/Web3Modal/Views/DeepLinkView/DeepLinkView");
+        }
+
+        public DeepLinkView(string visualTreePath)
+        {
+            var asset = Resources.Load<VisualTreeAsset>(visualTreePath ?? "WalletConnect/Web3Modal/Views/DeepLinkView/DeepLinkView");
             asset.CloneTree(this);
 
             name = Name;

Packages/com.walletconnect.web3modal/Runtime/Views/NetworkLoadingView/NetworkLoadingView.cs

@@ -19,10 +19,14 @@ public class NetworkLoadingView : VisualElement
         public new class UxmlFactory : UxmlFactory<NetworkLoadingView>
         {
         }
+        
+        public NetworkLoadingView() : this(null)
+        {
+        }
 
-        public NetworkLoadingView()
+        public NetworkLoadingView(string visualTreePath)
         {
-            var asset = Resources.Load<VisualTreeAsset>("WalletConnect/Web3Modal/Views/NetworkLoadingView/NetworkLoadingView");
+            var asset = Resources.Load<VisualTreeAsset>(visualTreePath ?? "WalletConnect/Web3Modal/Views/NetworkLoadingView/NetworkLoadingView");
             asset.CloneTree(this);
 
             name = Name;

Packages/com.walletconnect.web3modal/Runtime/Views/NetworkSearchView/NetworkSearchView.cs

@@ -16,10 +16,14 @@ public class NetworkSearchView : VisualElement
         public new class UxmlFactory : UxmlFactory<NetworkSearchView>
         {
         }
+        
+        public NetworkSearchView() : this(null)
+        {
+        }
 
-        public NetworkSearchView()
+        public NetworkSearchView(string visualTreePath)
         {
-            var asset = Resources.Load<VisualTreeAsset>("WalletConnect/Web3Modal/Views/NetworkSearchView/NetworkSearchView");
+            var asset = Resources.Load<VisualTreeAsset>(visualTreePath ?? "WalletConnect/Web3Modal/Views/NetworkSearchView/NetworkSearchView");
             asset.CloneTree(this);
 
             name = Name;

Packages/com.walletconnect.web3modal/Runtime/Views/QrCodeView/QrCodeView.cs

@@ -28,10 +28,14 @@ public class QrCodeView : VisualElement
         public new class UxmlFactory : UxmlFactory<QrCodeView>
         {
         }
+        
+        public QrCodeView() : this(null)
+        {
+        }
 
-        public QrCodeView()
+        public QrCodeView(string visualTreePath)
         {
-            var asset = Resources.Load<VisualTreeAsset>("WalletConnect/Web3Modal/Views/QrCodeView/QrCodeView");
+            var asset = Resources.Load<VisualTreeAsset>(visualTreePath ?? "WalletConnect/Web3Modal/Views/QrCodeView/QrCodeView");
             asset.CloneTree(this);
 
             name = Name;