Merge pull request #483 from nova-wallet/develop

v4.0.1 Governance support & fixes

Podfile

@@ -22,7 +22,8 @@ abstract_target 'novawalletAll' do
   pod 'Charts'
   pod 'SwiftRLP', :git => 'https://github.com/ERussel/SwiftRLP.git'
   pod 'Starscream', :git => 'https://github.com/ERussel/Starscream.git', :tag => '4.0.5'
-
+  pod 'CDMarkdownKit', :git => 'https://github.com/nova-wallet/CDMarkdownKit.git', :tag => '2.4.0'
+
   target 'novawalletTests' do
     inherit! :search_paths
 

Podfile.lock

@@ -1,8 +1,10 @@
 PODS:
   - BigInt (5.2.0)
-  - Charts (3.6.0):
-    - Charts/Core (= 3.6.0)
-  - Charts/Core (3.6.0)
+  - CDMarkdownKit (2.3.0)
+  - Charts (4.1.0):
+    - Charts/Core (= 4.1.0)
+  - Charts/Core (4.1.0):
+    - SwiftAlgorithms (~> 1.0)
   - CocoaLumberjack (3.7.2):
     - CocoaLumberjack/Core (= 3.7.2)
   - CocoaLumberjack/Core (3.7.2)
@@ -114,6 +116,7 @@ PODS:
     - xxHash-Swift (~> 1.0.0)
   - SVGKit (2.1.0):
     - CocoaLumberjack (~> 3.0)
+  - SwiftAlgorithms (1.0.0)
   - SwiftFormat/CLI (0.47.13)
   - SwiftLint (0.43.1)
   - SwiftRLP (1.1):
@@ -123,6 +126,7 @@ PODS:
   - xxHash-Swift (1.0.13)
 
 DEPENDENCIES:
+  - CDMarkdownKit (from `https://github.com/nova-wallet/CDMarkdownKit.git`, tag `2.4.0`)
   - Charts
   - CommonWallet/Core (from `https://github.com/ERussel/Capital-iOS.git`, tag `1.16.0`)
   - Cuckoo
@@ -164,13 +168,17 @@ SPEC REPOS:
     - SoraFoundation
     - SoraKeystore
     - Sourcery
+    - SwiftAlgorithms
     - SwiftFormat
     - SwiftLint
     - SwiftyBeaver
     - TweetNacl
     - xxHash-Swift
 
 EXTERNAL SOURCES:
+  CDMarkdownKit:
+    :git: https://github.com/nova-wallet/CDMarkdownKit.git
+    :tag: 2.4.0
   CommonWallet:
     :git: https://github.com/ERussel/Capital-iOS.git
     :tag: 1.16.0
@@ -190,6 +198,9 @@ EXTERNAL SOURCES:
     :git: https://github.com/ERussel/SwiftRLP.git
 
 CHECKOUT OPTIONS:
+  CDMarkdownKit:
+    :git: https://github.com/nova-wallet/CDMarkdownKit.git
+    :tag: 2.4.0
   CommonWallet:
     :git: https://github.com/ERussel/Capital-iOS.git
     :tag: 1.16.0
@@ -211,7 +222,8 @@ CHECKOUT OPTIONS:
 
 SPEC CHECKSUMS:
   BigInt: f668a80089607f521586bbe29513d708491ef2f7
-  Charts: b1e3a1f5a1c9ba5394438ca3b91bd8c9076310af
+  CDMarkdownKit: 9154c4e31f105e6a83b726412787d85e56edba46
+  Charts: 354f86803d11d9c35de280587fef50d1af063978
   CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da
   CommonWallet: 59fdbf5511d6fcdc38496db4baf425dd0cf29274
   Cuckoo: 9e258d68137c411df47c6390f72901d5276b4f03
@@ -233,13 +245,14 @@ SPEC CHECKSUMS:
   Starscream: 8cc648110705c09a15f0de84352c7f9595b7cb05
   SubstrateSdk: 6923efefde7463684701e9f4f5b0216eb6578a71
   SVGKit: 132b010efbf57ec345309fe4a7f627c0a40c5d63
+  SwiftAlgorithms: 38dda4731d19027fdeee1125f973111bf3386b53
   SwiftFormat: 73573b89257437c550b03d934889725fbf8f75e5
   SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52
   SwiftRLP: f58417bfceecd45394fc619ccad14cf16e4ae6c1
   SwiftyBeaver: 2e8acd6fc90c6d0a27055867a290794926d57c02
   TweetNacl: 3abf4d1d2082b0114e7a67410e300892448951e6
   xxHash-Swift: 30bd6a7507b3b7348a277c49b1cb6346c2905ec7
 
-PODFILE CHECKSUM: 4d0db693ac4524f7e22cfc95b6546c23edf7f2d1
+PODFILE CHECKSUM: f0266fabfe6e7f6dfb62690262b3b1c8ab02bfba
 
 COCOAPODS: 1.11.3

novawallet/Assets.xcassets/colorBlack48.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.480",
+          "blue" : "0.000",
+          "green" : "0.000",
+          "red" : "0.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

novawallet/Assets.xcassets/colorBlack72.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.720",
+          "blue" : "0.000",
+          "green" : "0.000",
+          "red" : "0.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

novawallet/Assets.xcassets/colorDarkYellow.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x0A",
+          "green" : "0xC5",
+          "red" : "0xEB"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

novawallet/Assets.xcassets/colorGreen.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x19",
-          "green" : "0xFF",
-          "red" : "0x00"
+          "blue" : "0x37",
+          "green" : "0xCF",
+          "red" : "0x15"
         }
       },
       "idiom" : "universal"

novawallet/Assets.xcassets/colorGreen15CF37.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x37",
+          "green" : "0xCF",
+          "red" : "0x15"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

novawallet/Assets.xcassets/colorGreen24.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "0.240",
-          "blue" : "0.231",
-          "green" : "0.827",
-          "red" : "0.055"
+          "blue" : "0x3A",
+          "green" : "0xD2",
+          "red" : "0x0E"
         }
       },
       "idiom" : "universal"

novawallet/Assets.xcassets/colorRed40.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "0.400",
-          "blue" : "0.361",
-          "green" : "0.157",
-          "red" : "1.000"
+          "blue" : "0x5C",
+          "green" : "0x28",
+          "red" : "0xFF"
         }
       },
       "idiom" : "universal"

novawallet/Assets.xcassets/colorYellow12.colorset/Contents.json → novawallet/Assets.xcassets/colorRedFF3A69.colorset/Contents.json

@@ -4,9 +4,9 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "alpha" : "0.120",
-          "blue" : "0x11",
-          "green" : "0xE7",
+          "alpha" : "1.000",
+          "blue" : "0x69",
+          "green" : "0x3A",
           "red" : "0xFF"
         }
       },

novawallet/Assets.xcassets/colorSliderOverlay.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x3A",
+          "green" : "0x3A",
+          "red" : "0x3A"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

novawallet/Assets.xcassets/colorYellow.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x11",
-          "green" : "0xE7",
-          "red" : "0xFF"
+          "blue" : "0x0A",
+          "green" : "0xC5",
+          "red" : "0xEB"
         }
       },
       "idiom" : "universal"

novawallet/Assets.xcassets/colorYellow16.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.160",
+          "blue" : "0x0A",
+          "green" : "0xC5",
+          "red" : "0xEB"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

novawallet/Assets.xcassets/gov/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

novawallet/Assets.xcassets/iconsTabBar/iconTabCrowloanFilled.imageset/Contents.json → novawallet/Assets.xcassets/gov/iconGovCrowdloan.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "iconTabCrowloanFilled.pdf",
+      "filename" : "iconGovCrowdloan.pdf",
       "idiom" : "universal"
     }
   ],

novawallet/Assets.xcassets/iconsTabBar/iconTabCrowloan.imageset/Contents.json → novawallet/Assets.xcassets/gov/iconGovFellowship.imageset/Contents.json

@@ -1,15 +1,12 @@
 {
   "images" : [
     {
-      "filename" : "iconTabCrowloan.pdf",
+      "filename" : "iconGovFellowship.pdf",
       "idiom" : "universal"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
   }
 }

novawallet/Assets.xcassets/gov/iconGovGovernance.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "iconGovGovernance.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

novawallet/Assets.xcassets/gov/iconGovStaking.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "iconGovStaking.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

novawallet/Assets.xcassets/gov/iconGovTreasury.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "iconGovTreasury.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

novawallet/Assets.xcassets/iconAmountDec.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "iconAmountDec.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

novawallet/Assets.xcassets/iconAmountInc.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "iconAmountInc.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

novawallet/Assets.xcassets/iconFire.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Fire.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}