Merge pull request #200 from cryptape/release/0.7.0

Release/0.7.0
citahub · Dec 4, 2018 · 7c526ac · 7c526ac
2 parents e923ab4 + 9774050
commit 7c526ac
Show file tree

Hide file tree

Showing 414 changed files with 10,487 additions and 8,035 deletions.
diff --git a/Neuron.xcodeproj/project.pbxproj b/Neuron.xcodeproj/project.pbxproj
diff --git a/Neuron.xcworkspace/xcshareddata/xcschemes/Neuron.xcscheme b/Neuron.xcworkspace/xcshareddata/xcschemes/Neuron.xcscheme
diff --git a/Neuron/AppDelegate.swift b/Neuron/AppDelegate.swift
@@ -17,7 +17,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         hookSensorsDebugWarning()
 
         skipBackupFiles()
-        RealmHelper.configureRealm()
+        RealmConfigurator.configure()
 
         window = UIWindow(frame: UIScreen.main.bounds)
         window?.rootViewController = UIStoryboard(name: .main).instantiateInitialViewController()
@@ -27,6 +27,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         GuideService.shared.register()
         AuthenticationService.shared.register()
         SensorsAnalytics.configureSensors()
+        _ = TransactionStatusManager.manager
         return true
     }
 

diff --git a/Neuron/Assets.xcassets/Setting/Contents.json → ...ssets.xcassets/DApp Browser/Contents.json b/Neuron/Assets.xcassets/Setting/Contents.json → ...ssets.xcassets/DApp Browser/Contents.json
diff --git a/...Bar/dappCollection.imageset/Contents.json → ...er/dapp_collection.imageset/Contents.json b/...Bar/dappCollection.imageset/Contents.json → ...er/dapp_collection.imageset/Contents.json
@@ -6,12 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "dappCollection@2x.png",
+      "filename" : "dapp_collection@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "dappCollection@3x.png",
+      "filename" : "dapp_collection@3x.png",
       "scale" : "3x"
     }
   ],

diff --git a/...on/Assets.xcassets/DApp Browser/dapp_collection.imageset/[email protected] b/...on/Assets.xcassets/DApp Browser/dapp_collection.imageset/[email protected]
diff --git a/...on/Assets.xcassets/DApp Browser/dapp_collection.imageset/[email protected] b/...on/Assets.xcassets/DApp Browser/dapp_collection.imageset/[email protected]
diff --git a/Neuron/Assets.xcassets/DApp Browser/dapp_default.imageset/Contents.json b/Neuron/Assets.xcassets/DApp Browser/dapp_default.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Neuron/Assets.xcassets/DApp Browser/dapp_default.imageset/[email protected] b/Neuron/Assets.xcassets/DApp Browser/dapp_default.imageset/[email protected]
diff --git a/Neuron/Assets.xcassets/DApp Browser/dapp_default.imageset/[email protected] b/Neuron/Assets.xcassets/DApp Browser/dapp_default.imageset/[email protected]
diff --git a/Neuron/Assets.xcassets/DApp Browser/webview_ahead_off.imageset/Contents.json b/Neuron/Assets.xcassets/DApp Browser/webview_ahead_off.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...ssets.xcassets/DApp Browser/webview_ahead_off.imageset/[email protected] b/...ssets.xcassets/DApp Browser/webview_ahead_off.imageset/[email protected]
diff --git a/...ssets.xcassets/DApp Browser/webview_ahead_off.imageset/[email protected] b/...ssets.xcassets/DApp Browser/webview_ahead_off.imageset/[email protected]
diff --git a/Neuron/Assets.xcassets/DApp Browser/webview_ahead_on.imageset/Contents.json b/Neuron/Assets.xcassets/DApp Browser/webview_ahead_on.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/.../Assets.xcassets/DApp Browser/webview_ahead_on.imageset/[email protected] b/.../Assets.xcassets/DApp Browser/webview_ahead_on.imageset/[email protected]
diff --git a/.../Assets.xcassets/DApp Browser/webview_ahead_on.imageset/[email protected] b/.../Assets.xcassets/DApp Browser/webview_ahead_on.imageset/[email protected]
diff --git a/Neuron/Assets.xcassets/DApp Browser/webview_back_off.imageset/Contents.json b/Neuron/Assets.xcassets/DApp Browser/webview_back_off.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/.../Assets.xcassets/DApp Browser/webview_back_off.imageset/[email protected] b/.../Assets.xcassets/DApp Browser/webview_back_off.imageset/[email protected]
diff --git a/.../Assets.xcassets/DApp Browser/webview_back_off.imageset/[email protected] b/.../Assets.xcassets/DApp Browser/webview_back_off.imageset/[email protected]
diff --git a/...cons/select_status.imageset/Contents.json → ...er/webview_back_on.imageset/Contents.json b/...cons/select_status.imageset/Contents.json → ...er/webview_back_on.imageset/Contents.json
@@ -6,12 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "select_status@2x.png",
+      "filename" : "webview_back_on@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "select_status@3x.png",
+      "filename" : "webview_back_on@3x.png",
       "scale" : "3x"
     }
   ],

diff --git a/...on/Assets.xcassets/DApp Browser/webview_back_on.imageset/[email protected] b/...on/Assets.xcassets/DApp Browser/webview_back_on.imageset/[email protected]
diff --git a/...on/Assets.xcassets/DApp Browser/webview_back_on.imageset/[email protected] b/...on/Assets.xcassets/DApp Browser/webview_back_on.imageset/[email protected]
diff --git a/Neuron/Assets.xcassets/Icons/NullLogo.imageset/Contents.json b/Neuron/Assets.xcassets/Icons/NullLogo.imageset/Contents.json
diff --git a/Neuron/Assets.xcassets/Icons/NullLogo.imageset/Group 2.png b/Neuron/Assets.xcassets/Icons/NullLogo.imageset/Group 2.png
diff --git a/Neuron/Assets.xcassets/Icons/NullLogo.imageset/Group [email protected] b/Neuron/Assets.xcassets/Icons/NullLogo.imageset/Group [email protected]
diff --git a/Neuron/Assets.xcassets/Icons/NullLogo.imageset/Group [email protected] b/Neuron/Assets.xcassets/Icons/NullLogo.imageset/Group [email protected]
diff --git a/Neuron/Assets.xcassets/Icons/Triangle.imageset/[email protected] b/Neuron/Assets.xcassets/Icons/Triangle.imageset/[email protected]
diff --git a/Neuron/Assets.xcassets/Icons/Triangle.imageset/[email protected] b/Neuron/Assets.xcassets/Icons/Triangle.imageset/[email protected]
diff --git a/Neuron/Assets.xcassets/Icons/close.imageset/Contents.json b/Neuron/Assets.xcassets/Icons/close.imageset/Contents.json
@@ -6,12 +6,11 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "close@2x.png",
+      "filename" : "关闭 (1).png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],

diff --git a/Neuron/Assets.xcassets/Icons/close.imageset/[email protected] b/Neuron/Assets.xcassets/Icons/close.imageset/[email protected]
diff --git a/Neuron/Assets.xcassets/Icons/close.imageset/[email protected] b/Neuron/Assets.xcassets/Icons/close.imageset/[email protected]
diff --git a/Neuron/Assets.xcassets/Icons/close.imageset/关闭 (1).png b/Neuron/Assets.xcassets/Icons/close.imageset/关闭 (1).png
diff --git a/Neuron/Assets.xcassets/Icons/closeWebView.imageset/Contents.json b/Neuron/Assets.xcassets/Icons/closeWebView.imageset/Contents.json
diff --git a/Neuron/Assets.xcassets/Icons/closeWebView.imageset/close.png b/Neuron/Assets.xcassets/Icons/closeWebView.imageset/close.png
diff --git a/Neuron/Assets.xcassets/Icons/closeWebView.imageset/[email protected] b/Neuron/Assets.xcassets/Icons/closeWebView.imageset/[email protected]
diff --git a/Neuron/Assets.xcassets/Icons/closeWebView.imageset/[email protected] b/Neuron/Assets.xcassets/Icons/closeWebView.imageset/[email protected]
diff --git a/....xcassets/Icons/复制.imageset/Contents.json → ...cassets/Icons/copy.imageset/Contents.json b/....xcassets/Icons/复制.imageset/Contents.json → ...cassets/Icons/copy.imageset/Contents.json
diff --git a/.../Assets.xcassets/Icons/复制.imageset/复制.png → ...ssets.xcassets/Icons/copy.imageset/复制.png b/.../Assets.xcassets/Icons/复制.imageset/复制.png → ...ssets.xcassets/Icons/copy.imageset/复制.png
diff --git a/...sets.xcassets/Icons/复制.imageset/复制@2x.png → ...ts.xcassets/Icons/copy.imageset/复制@2x.png b/...sets.xcassets/Icons/复制.imageset/复制@2x.png → ...ts.xcassets/Icons/copy.imageset/复制@2x.png
diff --git a/...sets.xcassets/Icons/复制.imageset/复制@3x.png → ...ts.xcassets/Icons/copy.imageset/复制@3x.png b/...sets.xcassets/Icons/复制.imageset/复制@3x.png → ...ts.xcassets/Icons/copy.imageset/复制@3x.png
diff --git a/Neuron/Assets.xcassets/Icons/emptyData.imageset/Contents.json b/Neuron/Assets.xcassets/Icons/emptyData.imageset/Contents.json
diff --git a/Neuron/Assets.xcassets/Icons/emptyData.imageset/emptyData.png b/Neuron/Assets.xcassets/Icons/emptyData.imageset/emptyData.png
diff --git a/Neuron/Assets.xcassets/Icons/emptyData.imageset/[email protected] b/Neuron/Assets.xcassets/Icons/emptyData.imageset/[email protected]
diff --git a/Neuron/Assets.xcassets/Icons/emptyData.imageset/[email protected] b/Neuron/Assets.xcassets/Icons/emptyData.imageset/[email protected]
diff --git a/...ets/Icons/ETH_test.imageset/Contents.json → ...ets/Icons/eth_test.imageset/Contents.json b/...ets/Icons/ETH_test.imageset/Contents.json → ...ets/Icons/eth_test.imageset/Contents.json
diff --git a/...sets/Icons/ETH_test.imageset/ETH_test.png → ...sets/Icons/eth_test.imageset/ETH_test.png b/...sets/Icons/ETH_test.imageset/ETH_test.png → ...sets/Icons/eth_test.imageset/ETH_test.png
diff --git a/...s/Icons/ETH_test.imageset/[email protected] → ...s/Icons/eth_test.imageset/[email protected] b/...s/Icons/ETH_test.imageset/[email protected] → ...s/Icons/eth_test.imageset/[email protected]
diff --git a/...s/Icons/ETH_test.imageset/[email protected] → ...s/Icons/eth_test.imageset/[email protected] b/...s/Icons/ETH_test.imageset/[email protected] → ...s/Icons/eth_test.imageset/[email protected]
diff --git a/...hangepassword_info.imageset/Contents.json → ...hangepassword_info.imageset/Contents.json b/...hangepassword_info.imageset/Contents.json → ...hangepassword_info.imageset/Contents.json
diff --git a/.../icon_changepassword_info.imageset/警告.png → .../icon_changepassword_info.imageset/警告.png b/.../icon_changepassword_info.imageset/警告.png → .../icon_changepassword_info.imageset/警告.png
diff --git a/...Setting/PeckShield.imageset/Contents.json → ...Icons/icon_refresh.imageset/Contents.json b/...Setting/PeckShield.imageset/Contents.json → ...Icons/icon_refresh.imageset/Contents.json
@@ -6,7 +6,7 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "1527734402443453.png",
+      "filename" : "刷新.png",
       "scale" : "2x"
     },
     {

diff --git a/Neuron/Assets.xcassets/Icons/icon_refresh.imageset/刷新.png b/Neuron/Assets.xcassets/Icons/icon_refresh.imageset/刷新.png
diff --git a/...ssets/Setting/Cita.imageset/Contents.json → ...ns/icon_wallet_add.imageset/Contents.json b/...ssets/Setting/Cita.imageset/Contents.json → ...ns/icon_wallet_add.imageset/Contents.json
@@ -6,7 +6,7 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "CITA-Logo-1024x1024-适用灰底透明 (1).png",
+      "filename" : "Group 3.png",
       "scale" : "2x"
     },
     {

diff --git a/Neuron/Assets.xcassets/Icons/icon_wallet_add.imageset/Group 3.png b/Neuron/Assets.xcassets/Icons/icon_wallet_add.imageset/Group 3.png
diff --git a/...ets/Icons/Triangle.imageset/Contents.json → ...icon_wallet_qrcode.imageset/Contents.json b/...ets/Icons/Triangle.imageset/Contents.json → ...icon_wallet_qrcode.imageset/Contents.json
@@ -6,12 +6,11 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "Triangle@2x.png",
+      "filename" : "Group 6.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],

diff --git a/Neuron/Assets.xcassets/Icons/icon_wallet_qrcode.imageset/Group 6.png b/Neuron/Assets.xcassets/Icons/icon_wallet_qrcode.imageset/Group 6.png
diff --git a/.../TabBar/setting_on.imageset/Contents.json → ...icon_wallet_switch.imageset/Contents.json b/.../TabBar/setting_on.imageset/Contents.json → ...icon_wallet_switch.imageset/Contents.json
@@ -6,12 +6,11 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "setting_on@2x.png",
+      "filename" : "切换 (2).png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],

diff --git a/Neuron/Assets.xcassets/Icons/icon_wallet_switch.imageset/切换 (2).png b/Neuron/Assets.xcassets/Icons/icon_wallet_switch.imageset/切换 (2).png