Skip to content

Commit

Permalink
Merge pull request #266 from cryptape/rc/v0.7.1
Browse files Browse the repository at this point in the history
Rc/v0.7.1
  • Loading branch information
XiaoLu authored Jan 22, 2019
2 parents 7c526ac + 9193ab6 commit af7f0ef
Show file tree
Hide file tree
Showing 599 changed files with 8,101 additions and 19,298 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: objective-c
osx_image: xcode10
xcode_workspace: Neuron.xcworkspace
xcode_scheme: Neuron
osx_image: xcode10.1
xcode_workspace: Cyton.xcworkspace
xcode_scheme: Cyton
xcode_destination: platform=iOS Simulator,OS=11.3,name=iPhone X
before_install:
- travis_wait pod repo update --silent
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
All notable changes to this project will be documented in this file.

# [v0.7.1](https://github.com/cryptape/cyton-ios/compare/v0.7.0...v0.7.1) (2019-01-22)

### BREAKING CHANGES

* Rename the project to `Cyton`. Change top module from `AppChain` to `CITA`.
* Support internationalization.
* Fix known bugs.

---

* 修改钱包名称为 Cyton , 修改项目中的 “AppChain” 为 “CITA”。
* 增加国际化,支持中文和英文。
* 修复已知 BUG 。
662 changes: 399 additions & 263 deletions Neuron.xcodeproj/project.pbxproj → Cyton.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

101 changes: 101 additions & 0 deletions Cyton.xcodeproj/xcshareddata/xcschemes/Cyton.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "896D042820AE69C1002CFF6A"
BuildableName = "Cyton.app"
BlueprintName = "Cyton"
ReferencedContainer = "container:Cyton.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "896D043C20AE69C5002CFF6A"
BuildableName = "CytonTests.xctest"
BlueprintName = "CytonTests"
ReferencedContainer = "container:Cyton.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "896D042820AE69C1002CFF6A"
BuildableName = "Cyton.app"
BlueprintName = "Cyton"
ReferencedContainer = "container:Cyton.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "896D042820AE69C1002CFF6A"
BuildableName = "Cyton.app"
BlueprintName = "Cyton"
ReferencedContainer = "container:Cyton.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "896D042820AE69C1002CFF6A"
BuildableName = "Cyton.app"
BlueprintName = "Cyton"
ReferencedContainer = "container:Cyton.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 3 additions & 17 deletions Neuron/AppDelegate.swift → Cyton/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// AppDelegate.swift
// Neuron
// Cyton
//
// Created by XiaoLu on 2018/5/18.
// Copyright © 2018年 cryptape. All rights reserved.
Expand All @@ -14,8 +14,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
hookSensorsDebugWarning()

skipBackupFiles()
RealmConfigurator.configure()

Expand All @@ -26,8 +24,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
setupKeyboard()
GuideService.shared.register()
AuthenticationService.shared.register()
SensorsAnalytics.configureSensors()
_ = TransactionStatusManager.manager
EthereumLocalTxPool.pool.register()
CITALocalTxPool.pool.register()
return true
}

Expand All @@ -45,18 +43,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
SkipBackupFiles(paths: paths).skip()
}

private func hookSensorsDebugWarning() {
guard let cls = NSClassFromString("SensorsAnalyticsSDK") else { return }
let originalSelector = NSSelectorFromString("showDebugModeWarning:withNoMoreButton:")
let swizzledSelector = #selector(sensorsShowDebugModeWarning(message:showNoMore:))
guard let swizzledMethod = class_getInstanceMethod(self.classForCoder, swizzledSelector) else { return }
let swizzledMethodImp = method_getImplementation(swizzledMethod)
class_replaceMethod(cls, originalSelector, swizzledMethodImp, method_getTypeEncoding(swizzledMethod))
}

@objc func sensorsShowDebugModeWarning(message: String, showNoMore: Bool) {
}

func applicationWillResignActive(_ application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
22 changes: 22 additions & 0 deletions Cyton/Assets.xcassets/Icons/select_chain.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Original file line number Diff line number Diff line change
@@ -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"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
},
{
"idiom" : "universal",
"filename" : "launchIcon@2x.png",
"filename" : "分享-top@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "launchIcon@3x.png",
"filename" : "分享-top@3x.png",
"scale" : "3x"
}
],
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
6 changes: 6 additions & 0 deletions Cyton/Assets.xcassets/Transaction/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
6 changes: 6 additions & 0 deletions Cyton/Assets.xcassets/Transaction/Details/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Original file line number Diff line number Diff line change
@@ -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"
}
}
Original file line number Diff line number Diff line change
@@ -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"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "形状@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "形状@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
6 changes: 6 additions & 0 deletions Cyton/Assets.xcassets/Transaction/Send/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading

0 comments on commit af7f0ef

Please sign in to comment.