[trello.com/c/vawidi4o] Setting secret wallet icon displaying.

Author: Lainaaa

Adamant.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -54,7 +54,7 @@
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </view>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="secret_wallets_regular" translatesAutoresizingMaskIntoConstraints="NO" id="Man-rA-gFA">
-                    <rect key="frame" x="271.5" y="45" width="35" height="35"/>
+                    <rect key="frame" x="306.5" y="45" width="35" height="35"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="35" id="45y-Er-QMf"/>
                         <constraint firstAttribute="height" constant="35" id="YhE-0q-neO"/>
@@ -64,11 +64,11 @@
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="LHk-7R-5oq" firstAttribute="top" secondItem="6hF-gW-1fF" secondAttribute="bottom" constant="28" id="0d9-Ro-csQ"/>
+                <constraint firstItem="Man-rA-gFA" firstAttribute="leading" secondItem="IVQ-4p-zci" secondAttribute="trailing" constant="80" id="2eO-z5-9Ha"/>
                 <constraint firstItem="Man-rA-gFA" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="45" id="4Gw-op-P7G"/>
                 <constraint firstAttribute="bottom" secondItem="LHk-7R-5oq" secondAttribute="bottom" id="5u8-dI-fD1"/>
                 <constraint firstItem="6hF-gW-1fF" firstAttribute="top" secondItem="IVQ-4p-zci" secondAttribute="bottom" constant="13" id="EN0-a5-cHs"/>
                 <constraint firstAttribute="trailing" secondItem="LHk-7R-5oq" secondAttribute="trailing" id="FJv-73-Ayr"/>
-                <constraint firstItem="Man-rA-gFA" firstAttribute="leading" secondItem="IVQ-4p-zci" secondAttribute="trailing" constant="45" id="YDE-9H-P5x"/>
                 <constraint firstItem="IVQ-4p-zci" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="25" id="Z7D-Q0-s2x"/>
                 <constraint firstItem="LHk-7R-5oq" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="eip-WC-PKw"/>
                 <constraint firstItem="6hF-gW-1fF" firstAttribute="centerX" secondItem="IVQ-4p-zci" secondAttribute="centerX" id="gMH-Q7-bMw"/>

Adamant/Modules/Account/AccountHeader.xib

@@ -21,7 +21,8 @@ final class AccountHeaderView: UIView {
     @IBOutlet weak var addressButton: UIButton!
     @IBOutlet weak var walletViewContainer: UIView!
     @IBOutlet weak var secretWalletsImageView: UIImageView!
-    private var outlineLayer: CAShapeLayer?
+    
+    private var circularBackgroundView: UIView?
 
     weak var delegate: AccountHeaderViewDelegate?
 
@@ -34,6 +35,20 @@ final class AccountHeaderView: UIView {
         setupGestureRecognizers()
     }
 
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        guard let bgView = circularBackgroundView else { return }
+        
+        let iconFrame = secretWalletsImageView.frame
+        let bgWidth = iconFrame.width * 2
+        let bgHeight = iconFrame.height * 2
+        bgView.frame = CGRect(x: iconFrame.midX - bgWidth / 2,
+                              y: iconFrame.midY - bgHeight / 2,
+                              width: bgWidth,
+                              height: bgHeight)
+        bgView.layer.cornerRadius = bgWidth / 2
+    }
+    
     func setWalletIcon(_ icon: WalletIcon, badgeCount: Int) {
         secretWalletsImageView.tintColor = .adamant.secondary
         secretWalletsImageView.image = .asset(named: icon.rawValue)?.withRenderingMode(.alwaysTemplate) ?? .init()
@@ -48,19 +63,6 @@ final class AccountHeaderView: UIView {
         animateOutline()
         delegate?.walletsButtonTapped(from: secretWalletsImageView)
     }
-    
-    override func layoutSubviews() {
-        super.layoutSubviews()
-        
-        guard let outlineLayer = outlineLayer else { return }
-        guard !secretWalletsImageView.frame.isEmpty else { return }
-        
-        let imageView = secretWalletsImageView!
-        let center = imageView.center
-        let radius = imageView.bounds.width
-        let path = UIBezierPath(arcCenter: center, radius: radius, startAngle: 0, endAngle: .pi * 2, clockwise: true)
-        outlineLayer.path = path.cgPath
-    }
 }
 
 private extension AccountHeaderView {
@@ -79,16 +81,24 @@ private extension AccountHeaderView {
     }
 
     private func addPersistentOutline() {
+        let bgView = UIView()
+        bgView.backgroundColor = UIColor { traitCollection in
+            return traitCollection.userInterfaceStyle == .dark
+            ? .adamant.secondary
+            : UIColor.black
+        }
 
+        secretWalletsImageView.superview?.insertSubview(bgView, belowSubview: secretWalletsImageView)
+        self.circularBackgroundView = bgView
     }
 
     private func animateOutline() {
 
     }
 }
 
-extension AccountHeaderView{
-    enum WalletIcon: String{
+extension AccountHeaderView {
+    enum WalletIcon: String {
         case regular = "secret_wallets_regular"
         case secret = "secret_wallets_active"
 

Adamant/Modules/Account/AccountHeaderView.swift

@@ -271,5 +271,12 @@ extension UIColor {
 
         // Outcome transfer icon background, light red
         public static let transferOutcomeIconBackground = #colorLiteral(red: 0.9411764706, green: 0.5215686275, blue: 0.5294117647, alpha: 1) //#F08587
+        
+        // MARK: Secret Wallets
+        public static var secretWalletButtonBackground: UIColor {
+            let colorWhiteTheme  =  #colorLiteral(red: 0.9450980392, green: 0.9450980392, blue: 0.9647058824, alpha: 1) //#F1F1F6
+            let colorDarkTheme   = UIColor.white.withAlphaComponent(0.3)
+            return returnColorByTheme(colorWhiteTheme: colorWhiteTheme, colorDarkTheme: colorDarkTheme)
+        }
     }
 }