overview UI and implementation of account mixer

Decred Wallet.xcodeproj/xcshareddata/xcschemes/Decred Wallet Testnet.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Decred Wallet.xcodeproj/xcshareddata/xcschemes/Decred Wallet.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Decred Wallet/Assets.xcassets/ic_alert.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "alert.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Decred Wallet/Assets.xcassets/ic_arrow_next.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "nextpdf.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Decred Wallet/Assets.xcassets/ic_collapseNew.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Shape.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Decred Wallet/Assets.xcassets/ic_confimedNew.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_confirmed_12px.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Decred Wallet/Assets.xcassets/ic_dropdownNew.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_colapse.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Decred Wallet/Assets.xcassets/ic_goto_arrow.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "goto.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Decred Wallet/Assets.xcassets/ic_mixer.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Icon.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Decred Wallet/Assets.xcassets/ic_mixer_new.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "Icon-2.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Decred Wallet/Assets.xcassets/ic_mixer_setup.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Image.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Decred Wallet/Assets.xcassets/left-arrow.imageset/Contents.json

@@ -1,23 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "ic_back.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ic_back@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ic_back@3x.png",
-      "scale" : "3x"
+      "filename" : "Path.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
-}
+}

Decred Wallet/Constants/Constants.swift

@@ -21,6 +21,8 @@ struct GlobalConstants {
         static let MAINNET_HD_PATH = "m / 44' / 42' /"
         static let LEGACY_MAINNET_HD_PATH = "m / 44' / 20' /"
         static let DEFAULT = "default"
+        static let MIXED = "mixed"
+        static let UNMIXED = "unmixed"
     }
 
     struct Wallet {

Decred Wallet/Custom Views/ToolTipView.swift

@@ -0,0 +1,173 @@
+//
+//  ToolTipView.swift
+//  Decred Wallet
+//
+// Copyright (c) 2021 The Decred developers
+// Use of this source code is governed by an ISC
+// license that can be found in the LICENSE file.
+
+import UIKit
+
+@IBDesignable
+class TooltipView: UIView {
+
+    //MARK: - IBInspectable
+
+    @IBInspectable var arrowTopLeft: Bool = false
+    @IBInspectable var arrowTopCenter: Bool = true
+    @IBInspectable var arrowTopRight: Bool = false
+    @IBInspectable var arrowBottomLeft: Bool = false
+    @IBInspectable var arrowBottomCenter: Bool = false
+    @IBInspectable var arrowBottomRight: Bool = false
+
+    @IBInspectable var fillColor: UIColor = UIColor.white
+
+    @IBInspectable var borderColor: UIColor = UIColor(red:0, green:0, blue:0, alpha:0.05)
+    @IBInspectable var borderRadius: CGFloat = 7
+    @IBInspectable var borderWidth: CGFloat = 1
+
+    @IBInspectable var shadowColor: UIColor = UIColor(red:0, green:0, blue:0, alpha:0.14)
+    @IBInspectable var shadowOffsetX: CGFloat = 0
+    @IBInspectable var shadowOffsetY: CGFloat = 2
+    @IBInspectable var shadowBlur: CGFloat = 10
+
+    //MARK: - Global Variables
+
+    var tooltipWidth = 0
+    var tooltipHeight = 0
+
+    //MARK: - Initialization
+
+    override func draw(_ rect: CGRect) {
+        drawTooltip()
+    }
+
+    //MARK: - Private Methods
+
+    // Orientation methods
+
+    private func topLeft(_ x: CGFloat, _ y: CGFloat) -> CGPoint {
+        return CGPoint(x: x, y: y)
+    }
+
+    private func topRight(_ x: CGFloat, _ y: CGFloat) -> CGPoint {
+        return CGPoint(x: CGFloat(tooltipWidth) - x, y: y)
+    }
+
+    private func bottomLeft(_ x: CGFloat, _ y: CGFloat) -> CGPoint {
+        return CGPoint(x: x, y: CGFloat(tooltipHeight) - y)
+    }
+
+    private func bottomRight(_ x: CGFloat, _ y: CGFloat) -> CGPoint {
+        return CGPoint(x: CGFloat(tooltipWidth) - x, y: CGFloat(tooltipHeight) - y)
+    }
+
+    // Draw methods
+
+    private func drawTooltip() {
+
+        tooltipWidth = Int(bounds.width)
+        tooltipHeight = Int(bounds.height)
+
+        // Define Bubble Shape
+
+        let bubblePath = UIBezierPath()
+
+        // Top left corner
+
+        bubblePath.move(to: topLeft(0, borderRadius))
+        bubblePath.addCurve(to: topLeft(borderRadius, 0), controlPoint1: topLeft(0, borderRadius / 2), controlPoint2: topLeft(borderRadius / 2, 0))
+
+        // Top right corner
+
+        bubblePath.addLine(to: topRight(borderRadius, 0))
+        bubblePath.addCurve(to: topRight(0, borderRadius), controlPoint1: topRight(borderRadius / 2, 0), controlPoint2: topRight(0, borderRadius / 2))
+
+        // Bottom right corner
+
+        bubblePath.addLine(to: bottomRight(0, borderRadius))
+        bubblePath.addCurve(to: bottomRight(borderRadius, 0), controlPoint1: bottomRight(0, borderRadius / 2), controlPoint2: bottomRight(borderRadius / 2, 0))
+
+        // Bottom left corner
+
+        bubblePath.addLine(to: bottomLeft(borderRadius, 0))
+        bubblePath.addCurve(to: bottomLeft(0, borderRadius), controlPoint1: bottomLeft(borderRadius / 2, 0), controlPoint2: bottomLeft(0, borderRadius / 2))
+        bubblePath.close()
+
+        // Arrow
+
+        if(arrowTopLeft) {
+            bubblePath.move(to: topLeft(3, 10))
+            bubblePath.addLine(to: topLeft(3, -4))
+            bubblePath.addLine(to: topLeft(16, 2))
+            bubblePath.close()
+        }
+
+        if(arrowTopCenter) {
+            bubblePath.move(to: topLeft(CGFloat((tooltipWidth / 2) - 5), 0))
+            bubblePath.addLine(to: topLeft(CGFloat(tooltipWidth / 2), -8))
+            bubblePath.addLine(to: topLeft(CGFloat(tooltipWidth / 2 + 5), 0))
+            bubblePath.close()
+        }
+
+        if(arrowTopRight) {
+            bubblePath.move(to: topRight(16, 2))
+            bubblePath.addLine(to: topRight(3, -4))
+            bubblePath.addLine(to: topRight(3, 10))
+            bubblePath.close()
+
+        }
+
+        if(arrowBottomLeft) {
+            bubblePath.move(to: bottomLeft(16, 2))
+            bubblePath.addLine(to: bottomLeft(3, -4))
+            bubblePath.addLine(to: bottomLeft(3, 10))
+            bubblePath.close()
+        }
+
+        if(arrowBottomCenter) {
+            bubblePath.move(to: bottomLeft(CGFloat((tooltipWidth / 2) - 5), 0))
+            bubblePath.addLine(to: bottomLeft(CGFloat(tooltipWidth / 2), -8))
+            bubblePath.addLine(to: bottomLeft(CGFloat(tooltipWidth / 2 + 5), 0))
+            bubblePath.close()
+        }
+
+        if(arrowBottomRight) {
+            bubblePath.move(to: bottomRight(3, 10))
+            bubblePath.addLine(to: bottomRight(3, -4))
+            bubblePath.addLine(to: bottomRight(16, 2))
+            bubblePath.close()
+        }
+
+        // Shadow Layer
+
+        let shadowShape = CAShapeLayer()
+        shadowShape.path = bubblePath.cgPath
+        shadowShape.fillColor = fillColor.cgColor
+        shadowShape.shadowColor = shadowColor.cgColor
+        shadowShape.shadowOffset = CGSize(width: CGFloat(shadowOffsetX), height: CGFloat(shadowOffsetY))
+        shadowShape.shadowRadius = CGFloat(shadowBlur)
+        shadowShape.shadowOpacity = 0.8
+
+        // Border Layer
+
+        let borderShape = CAShapeLayer()
+        borderShape.path = bubblePath.cgPath
+        borderShape.fillColor = fillColor.cgColor
+        borderShape.strokeColor = borderColor.cgColor
+        borderShape.lineWidth = CGFloat(borderWidth*2)
+
+        // Fill Layer
+
+        let fillShape = CAShapeLayer()
+        fillShape.path = bubblePath.cgPath
+        fillShape.fillColor = fillColor.cgColor
+
+        // Add Sublayers
+
+        self.layer.insertSublayer(shadowShape, at: 0)
+        self.layer.insertSublayer(borderShape, at: 0)
+        self.layer.insertSublayer(fillShape, at: 0)
+
+    }
+}

Decred Wallet/Custom Views/WalletAccountView/WalletAccountView.swift

@@ -33,6 +33,8 @@ import Dcrlibwallet
     }
 
     var showWatchOnlyWallet = true
+    var showMixedAccount = true
+    var showUnMixedAccount = true
 
     var onAccountSelectionChanged: ((_ selectedWallet: DcrlibwalletWallet, _ selectedAccount: DcrlibwalletAccount) -> Void)?
 
@@ -78,6 +80,8 @@ import Dcrlibwallet
                                    title: accountSelectorDialogTitle,
                                    selectedWallet: self.selectedWallet,
                                    selectedAccount: self.selectedAccount, showWatchOnlyWallet: showWatchOnlyWallet,
+                                   showUnMixedAccount: showUnMixedAccount,
+                                   showMixedAccount: showMixedAccount,
                                    callback: self.updateSelectedAccount)
     }