API tools faq
paste
Advertisement
ff19

main_diff.diff

ff19
Aug 6th, 2018
445
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 261.08 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/bitshares_andriod_wallet/.git/config b/evraz-wallet/.git/config
  2. index e3fdfb4..1288691 100644
  3. --- a/bitshares_andriod_wallet/.git/config
  4. +++ b/evraz-wallet/.git/config
  5. @@ -5,7 +5,7 @@
  6.     logallrefupdates = true
  7.     ignorecase = true
  8.  [remote "origin"]
  9. -   url = https://github.com/bitshares/bitshares_andriod_wallet
  10. +   url = https://github.com/Stanoevich/evraz-wallet.git
  11.     fetch = +refs/heads/*:refs/remotes/origin/*
  12.  [branch "master"]
  13.     remote = origin
  14. diff --git a/bitshares_andriod_wallet/.git/index b/evraz-wallet/.git/index
  15. index b873dd4..9b0772d 100644
  16. Binary files a/bitshares_andriod_wallet/.git/index and b/evraz-wallet/.git/index differ
  17. diff --git a/bitshares_andriod_wallet/.git/logs/HEAD b/evraz-wallet/.git/logs/HEAD
  18. index da79ce4..f8a7dd2 100644
  19. --- a/bitshares_andriod_wallet/.git/logs/HEAD
  20. +++ b/evraz-wallet/.git/logs/HEAD
  21. @@ -1 +1 @@
  22. -0000000000000000000000000000000000000000 a0250b9b10798b46378068ca1ba2d614097f2951 Haruka Ma <mrx@hcc.im> 1533558780 +0900  clone: from https://github.com/bitshares/bitshares_andriod_wallet
  23. +0000000000000000000000000000000000000000 fabc720cacc680909713fe18bab973829a60ba98 Haruka Ma <mrx@hcc.im> 1533558774 +0900  clone: from https://github.com/Stanoevich/evraz-wallet.git
  24. diff --git a/bitshares_andriod_wallet/.git/logs/refs/heads/master b/evraz-wallet/.git/logs/refs/heads/master
  25. index da79ce4..f8a7dd2 100644
  26. --- a/bitshares_andriod_wallet/.git/logs/refs/heads/master
  27. +++ b/evraz-wallet/.git/logs/refs/heads/master
  28. @@ -1 +1 @@
  29. -0000000000000000000000000000000000000000 a0250b9b10798b46378068ca1ba2d614097f2951 Haruka Ma <mrx@hcc.im> 1533558780 +0900  clone: from https://github.com/bitshares/bitshares_andriod_wallet
  30. +0000000000000000000000000000000000000000 fabc720cacc680909713fe18bab973829a60ba98 Haruka Ma <mrx@hcc.im> 1533558774 +0900  clone: from https://github.com/Stanoevich/evraz-wallet.git
  31. diff --git a/bitshares_andriod_wallet/.git/logs/refs/remotes/origin/HEAD b/evraz-wallet/.git/logs/refs/remotes/origin/HEAD
  32. index da79ce4..f8a7dd2 100644
  33. --- a/bitshares_andriod_wallet/.git/logs/refs/remotes/origin/HEAD
  34. +++ b/evraz-wallet/.git/logs/refs/remotes/origin/HEAD
  35. @@ -1 +1 @@
  36. -0000000000000000000000000000000000000000 a0250b9b10798b46378068ca1ba2d614097f2951 Haruka Ma <mrx@hcc.im> 1533558780 +0900  clone: from https://github.com/bitshares/bitshares_andriod_wallet
  37. +0000000000000000000000000000000000000000 fabc720cacc680909713fe18bab973829a60ba98 Haruka Ma <mrx@hcc.im> 1533558774 +0900  clone: from https://github.com/Stanoevich/evraz-wallet.git
  38. diff --git a/evraz-wallet/.git/objects/pack/pack-16b69f7102351ffcff2c6a200885b4174950a017.idx b/evraz-wallet/.git/objects/pack/pack-16b69f7102351ffcff2c6a200885b4174950a017.idx
  39. new file mode 100644
  40. index 0000000..826ef56
  41. Binary files /dev/null and b/evraz-wallet/.git/objects/pack/pack-16b69f7102351ffcff2c6a200885b4174950a017.idx differ
  42. diff --git a/evraz-wallet/.git/objects/pack/pack-16b69f7102351ffcff2c6a200885b4174950a017.pack b/evraz-wallet/.git/objects/pack/pack-16b69f7102351ffcff2c6a200885b4174950a017.pack
  43. new file mode 100644
  44. index 0000000..5f51a29
  45. Binary files /dev/null and b/evraz-wallet/.git/objects/pack/pack-16b69f7102351ffcff2c6a200885b4174950a017.pack differ
  46. diff --git a/bitshares_andriod_wallet/.git/objects/pack/pack-458feac6ad4b2c7cad4ac39101c8116d6f2b297f.idx b/bitshares_andriod_wallet/.git/objects/pack/pack-458feac6ad4b2c7cad4ac39101c8116d6f2b297f.idx
  47. deleted file mode 100644
  48. index c12b513..0000000
  49. Binary files a/bitshares_andriod_wallet/.git/objects/pack/pack-458feac6ad4b2c7cad4ac39101c8116d6f2b297f.idx and /dev/null differ
  50. diff --git a/bitshares_andriod_wallet/.git/objects/pack/pack-458feac6ad4b2c7cad4ac39101c8116d6f2b297f.pack b/bitshares_andriod_wallet/.git/objects/pack/pack-458feac6ad4b2c7cad4ac39101c8116d6f2b297f.pack
  51. deleted file mode 100644
  52. index 2fe09d5..0000000
  53. Binary files a/bitshares_andriod_wallet/.git/objects/pack/pack-458feac6ad4b2c7cad4ac39101c8116d6f2b297f.pack and /dev/null differ
  54. diff --git a/bitshares_andriod_wallet/.git/packed-refs b/evraz-wallet/.git/packed-refs
  55. index a7a9fe1..27b9f15 100644
  56. --- a/bitshares_andriod_wallet/.git/packed-refs
  57. +++ b/evraz-wallet/.git/packed-refs
  58. @@ -1,2 +1,2 @@
  59.  # pack-refs with: peeled fully-peeled sorted
  60. -a0250b9b10798b46378068ca1ba2d614097f2951 refs/remotes/origin/master
  61. +fabc720cacc680909713fe18bab973829a60ba98 refs/remotes/origin/master
  62. diff --git a/bitshares_andriod_wallet/.git/refs/heads/master b/evraz-wallet/.git/refs/heads/master
  63. index bbb4daa..9455dcf 100644
  64. --- a/bitshares_andriod_wallet/.git/refs/heads/master
  65. +++ b/evraz-wallet/.git/refs/heads/master
  66. @@ -1 +1 @@
  67. -a0250b9b10798b46378068ca1ba2d614097f2951
  68. +fabc720cacc680909713fe18bab973829a60ba98
  69. diff --git a/bitshares_andriod_wallet/.gitignore b/evraz-wallet/.gitignore
  70. index 65b74d8..391f6dd 100644
  71. --- a/bitshares_andriod_wallet/.gitignore
  72. +++ b/evraz-wallet/.gitignore
  73. @@ -57,3 +57,5 @@ fabric.properties
  74.  freeline.py
  75.  freeline/
  76.  freeline_project_description.json
  77. +
  78. +app/signing.gradle
  79. \ No newline at end of file
  80. diff --git a/evraz-wallet/.hgignore b/evraz-wallet/.hgignore
  81. new file mode 100644
  82. index 0000000..8c395f4
  83. --- /dev/null
  84. +++ b/evraz-wallet/.hgignore
  85. @@ -0,0 +1,8 @@
  86. +syntax: glob
  87. +.gradle
  88. +.idea
  89. +build
  90. +*.iml
  91. +local.properties
  92. +crashlytics-build.properties
  93. +com_crashlytics_export_strings.xml
  94. diff --git a/bitshares_andriod_wallet/README.md b/evraz-wallet/README.md
  95. index 243378f..efd6fda 100644
  96. --- a/bitshares_andriod_wallet/README.md
  97. +++ b/evraz-wallet/README.md
  98. @@ -1,28 +1,16 @@
  99. -# bitshares_wallet
  100. +# evraz-wallet
  101.  
  102. -### Technical info
  103. -1. The core structure of BitShares Wallet reuses the bitshares-core implementation. All communication protocols were developed from scratch. The communication part will be separated as a library in the future.
  104. -2. The graphenej part is from smartcoins-wallet, and is used to read the .bin file when logging in with wallet model
  105. -3. Now we get the quotes data at fixed time, and haven’t finished developing the protocol using websocket to let the server push the data to the clients.
  106. -4. The source contains the code of firebase and fabric, while we don’t submit these two parts. You can add them yourself.
  107. -5. fabric.properties -> This file stores fabric’s apiSecret, corresponding io.fabric.ApiKey of manifest
  108. -6. google-services.json -> This file stores the info when connecting firebase
  109. -
  110. -
  111. -### Product info
  112. -#### BitShares Wallet is an app for BitShares on Android devices. The main features are:
  113. -
  114. -* **Wallet:**
  115. -1. Check your balance
  116. -2. Check the transaction records
  117. -3. Send your BTS/bitUSD or other properties to others using this wallet.
  118. -
  119. -* **Quotes:**
  120. -
  121. -1. Check the latest or history price of BTS
  122. -
  123. -* **Exchange:**
  124. -
  125. -1. Sell/Buy BTS easily
  126. -2. Check the SELL ORDER and BUY ORDER
  127. -3. Check your open orders
  128. +1. git clone --recursive https://bitbucket.org/zarincheg/evraz-wallet
  129. +2.If submodule not init
  130. + git submodule add https://github.com/bituniverse/graphenej.git graphenej
  131. +3. Create google-services.json
  132. +    3.1 Go to https://developers.google.com/mobile/add?platform=android&cntapi=signin&cnturl=https:%2F%2Fdevelopers.google.com%2Fidentity%2Fsign-in%2Fandroid%2Fsign-in%3Fconfigured%3Dtrue&cntlbl=Continue%20Adding%20Sign-In
  133. +    3.2 Configure
  134. +        App name: Evraz wallet
  135. +        Android package name: com.bitshares.bitshareswallet
  136. +    3.3* Select analytics tab and select default or new project
  137. +    3.4 Download file and put in app/
  138. +4. Build and run
  139. +
  140. +
  141. +* For use google signIn in prod, we create another google-services.json file in owner account with actual Android Signing Certificate SHA-1# evraz-wallet
  142. diff --git a/evraz-wallet/app/.hgignore b/evraz-wallet/app/.hgignore
  143. new file mode 100644
  144. index 0000000..8c395f4
  145. --- /dev/null
  146. +++ b/evraz-wallet/app/.hgignore
  147. @@ -0,0 +1,8 @@
  148. +syntax: glob
  149. +.gradle
  150. +.idea
  151. +build
  152. +*.iml
  153. +local.properties
  154. +crashlytics-build.properties
  155. +com_crashlytics_export_strings.xml
  156. diff --git a/bitshares_andriod_wallet/app/build.gradle b/evraz-wallet/app/build.gradle
  157. index 9913e3b..34b5b57 100644
  158. --- a/bitshares_andriod_wallet/app/build.gradle
  159. +++ b/evraz-wallet/app/build.gradle
  160. @@ -1,3 +1,9 @@
  161. +// Manifest version information!
  162. +def versionMajor = 0
  163. +def versionMinor = 3
  164. +def versionPatch = 3
  165. +def versionBuild = 1
  166. +
  167.  buildscript {
  168.      repositories {
  169.          maven { url 'https://maven.fabric.io/public' }
  170. @@ -9,6 +15,9 @@ buildscript {
  171.  }
  172.  apply plugin: 'com.android.application'
  173.  apply plugin: 'io.fabric'
  174. +/*if (file('signing.gradle').exists()) {
  175. +    apply from: 'signing.gradle'
  176. +}*/
  177.  
  178.  repositories {
  179.      maven { url 'https://maven.fabric.io/public' }
  180. @@ -20,15 +29,15 @@ android {
  181.      compileSdkVersion 26
  182.      buildToolsVersion '26.0.2'
  183.      defaultConfig {
  184. -        applicationId "com.bitshares.bitshareswallet"
  185. -        minSdkVersion 15
  186. +        applicationId "org.evrazcoin.evrazwallet"
  187. +        minSdkVersion 16
  188.          targetSdkVersion 25
  189. -        versionCode 10201001
  190. -        versionName "1.2.1.1"
  191. +        versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild
  192. +        versionName "${versionMajor}.${versionMinor}.${versionPatch}"
  193. +        setProperty("archivesBaseName", "evrazwallet-"  + versionName)
  194.          testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
  195.          multiDexEnabled true
  196.          vectorDrawables.useSupportLibrary = true
  197. -
  198.          javaCompileOptions {
  199.              annotationProcessorOptions {
  200.                  arguments = ["room.schemaLocation":
  201. @@ -36,8 +45,17 @@ android {
  202.              }
  203.          }
  204.      }
  205. +  /*  signingConfigs {
  206. +        release {
  207. +            storeFile file(project.signing.storeFilePath)
  208. +            storePassword project.signing.storePassword
  209. +            keyAlias project.signing.keyAlias
  210. +            keyPassword project.signing.keyPassword
  211. +        }
  212. +    }*/
  213.      buildTypes {
  214.          release {
  215. +//            signingConfig signingConfigs.release
  216.              minifyEnabled true
  217.              //proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
  218.              proguardFiles 'proguard-rules.pro'
  219. @@ -45,22 +63,19 @@ android {
  220.          debug {
  221.              applicationIdSuffix ".debug"
  222.              versionNameSuffix '-DEBUG'
  223. +            ext.enableCrashlytics = false
  224.          }
  225.      }
  226. -
  227.      configurations.all {
  228.          resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
  229.      }
  230. -
  231.      lintOptions {
  232.          disable 'MissingTranslation'
  233.      }
  234. -
  235.      compileOptions {
  236.          sourceCompatibility JavaVersion.VERSION_1_8
  237.          targetCompatibility JavaVersion.VERSION_1_8
  238.      }
  239. -
  240.      packagingOptions {
  241.          exclude 'META-INF/DEPENDENCIES'
  242.          exclude 'META-INF/NOTICE'
  243. @@ -79,11 +94,11 @@ android {
  244.          exclude 'lib/x86_64/freebsd/libscrypt.so'
  245.          exclude 'lib/x86_64/linux/libscrypt.so'
  246.      }
  247. -
  248.      dexOptions {
  249.          javaMaxHeapSize "6144m"
  250.      }
  251. -
  252. +    productFlavors {
  253. +    }
  254.  }
  255.  
  256.  dependencies {
  257. @@ -108,7 +123,8 @@ dependencies {
  258.      compile 'com.madgag.spongycastle:pg:1.51.0.0'
  259.      compile 'org.slf4j:slf4j-android:1.7.25'
  260.      compile 'com.google.protobuf:protobuf-java:3.4.0'
  261. -    compile 'com.squareup.okhttp3:okhttp:3.9.0'
  262. +    compile 'com.squareup.okhttp3:okhttp:3.10.0'
  263. +    implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
  264.      compile 'com.fasterxml.jackson.core:jackson-databind:2.5.1'
  265.      compile 'com.google.code.gson:gson:2.8.1'
  266.      compile 'com.kaopiz:kprogresshud:1.0.2'
  267. @@ -127,6 +143,7 @@ dependencies {
  268.      implementation 'io.reactivex.rxjava2:rxjava:2.1.5'
  269.      implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
  270.      implementation project(':graphenej:graphenej')
  271. +
  272.  }
  273.  
  274.  apply plugin: 'com.google.gms.google-services'
  275. \ No newline at end of file
  276. diff --git a/evraz-wallet/app/schemas/com.bitshares.bitshareswallet.room.BitsharesDatabase/1.json b/evraz-wallet/app/schemas/com.bitshares.bitshareswallet.room.BitsharesDatabase/1.json
  277. new file mode 100644
  278. index 0000000..ad7dcdd
  279. --- /dev/null
  280. +++ b/evraz-wallet/app/schemas/com.bitshares.bitshareswallet.room.BitsharesDatabase/1.json
  281. @@ -0,0 +1,313 @@
  282. +{
  283. +  "formatVersion": 1,
  284. +  "database": {
  285. +    "version": 1,
  286. +    "identityHash": "50adca5ce42c2b4860616029d4324041",
  287. +    "entities": [
  288. +      {
  289. +        "tableName": "balance",
  290. +        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `amount` INTEGER NOT NULL, `currency` TEXT, `asset_id` TEXT, `type` INTEGER NOT NULL, `precision` INTEGER NOT NULL)",
  291. +        "fields": [
  292. +          {
  293. +            "fieldPath": "id",
  294. +            "columnName": "id",
  295. +            "affinity": "INTEGER",
  296. +            "notNull": true
  297. +          },
  298. +          {
  299. +            "fieldPath": "amount",
  300. +            "columnName": "amount",
  301. +            "affinity": "INTEGER",
  302. +            "notNull": true
  303. +          },
  304. +          {
  305. +            "fieldPath": "currency",
  306. +            "columnName": "currency",
  307. +            "affinity": "TEXT",
  308. +            "notNull": false
  309. +          },
  310. +          {
  311. +            "fieldPath": "asset_id",
  312. +            "columnName": "asset_id",
  313. +            "affinity": "TEXT",
  314. +            "notNull": false
  315. +          },
  316. +          {
  317. +            "fieldPath": "type",
  318. +            "columnName": "type",
  319. +            "affinity": "INTEGER",
  320. +            "notNull": true
  321. +          },
  322. +          {
  323. +            "fieldPath": "precision",
  324. +            "columnName": "precision",
  325. +            "affinity": "INTEGER",
  326. +            "notNull": true
  327. +          }
  328. +        ],
  329. +        "primaryKey": {
  330. +          "columnNames": [
  331. +            "id"
  332. +          ],
  333. +          "autoGenerate": true
  334. +        },
  335. +        "indices": [
  336. +          {
  337. +            "name": "index_balance_asset_id_type",
  338. +            "unique": true,
  339. +            "columnNames": [
  340. +              "asset_id",
  341. +              "type"
  342. +            ],
  343. +            "createSql": "CREATE UNIQUE INDEX `index_balance_asset_id_type` ON `${TABLE_NAME}` (`asset_id`, `type`)"
  344. +          }
  345. +        ],
  346. +        "foreignKeys": []
  347. +      },
  348. +      {
  349. +        "tableName": "market_ticker",
  350. +        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `base` TEXT, `quote` TEXT, `latest` REAL, `lowest_ask` REAL, `highest_bid` REAL, `percent_change` TEXT, `base_volume` REAL, `quote_volume` REAL)",
  351. +        "fields": [
  352. +          {
  353. +            "fieldPath": "id",
  354. +            "columnName": "id",
  355. +            "affinity": "INTEGER",
  356. +            "notNull": true
  357. +          },
  358. +          {
  359. +            "fieldPath": "marketTicker.base",
  360. +            "columnName": "base",
  361. +            "affinity": "TEXT",
  362. +            "notNull": false
  363. +          },
  364. +          {
  365. +            "fieldPath": "marketTicker.quote",
  366. +            "columnName": "quote",
  367. +            "affinity": "TEXT",
  368. +            "notNull": false
  369. +          },
  370. +          {
  371. +            "fieldPath": "marketTicker.latest",
  372. +            "columnName": "latest",
  373. +            "affinity": "REAL",
  374. +            "notNull": false
  375. +          },
  376. +          {
  377. +            "fieldPath": "marketTicker.lowest_ask",
  378. +            "columnName": "lowest_ask",
  379. +            "affinity": "REAL",
  380. +            "notNull": false
  381. +          },
  382. +          {
  383. +            "fieldPath": "marketTicker.highest_bid",
  384. +            "columnName": "highest_bid",
  385. +            "affinity": "REAL",
  386. +            "notNull": false
  387. +          },
  388. +          {
  389. +            "fieldPath": "marketTicker.percent_change",
  390. +            "columnName": "percent_change",
  391. +            "affinity": "TEXT",
  392. +            "notNull": false
  393. +          },
  394. +          {
  395. +            "fieldPath": "marketTicker.base_volume",
  396. +            "columnName": "base_volume",
  397. +            "affinity": "REAL",
  398. +            "notNull": false
  399. +          },
  400. +          {
  401. +            "fieldPath": "marketTicker.quote_volume",
  402. +            "columnName": "quote_volume",
  403. +            "affinity": "REAL",
  404. +            "notNull": false
  405. +          }
  406. +        ],
  407. +        "primaryKey": {
  408. +          "columnNames": [
  409. +            "id"
  410. +          ],
  411. +          "autoGenerate": true
  412. +        },
  413. +        "indices": [
  414. +          {
  415. +            "name": "index_market_ticker_base_quote",
  416. +            "unique": true,
  417. +            "columnNames": [
  418. +              "base",
  419. +              "quote"
  420. +            ],
  421. +            "createSql": "CREATE UNIQUE INDEX `index_market_ticker_base_quote` ON `${TABLE_NAME}` (`base`, `quote`)"
  422. +          }
  423. +        ],
  424. +        "foreignKeys": []
  425. +      },
  426. +      {
  427. +        "tableName": "asset_object",
  428. +        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `asset_id` TEXT, `symbol` TEXT, `precision` INTEGER NOT NULL)",
  429. +        "fields": [
  430. +          {
  431. +            "fieldPath": "id",
  432. +            "columnName": "id",
  433. +            "affinity": "INTEGER",
  434. +            "notNull": true
  435. +          },
  436. +          {
  437. +            "fieldPath": "asset_id",
  438. +            "columnName": "asset_id",
  439. +            "affinity": "TEXT",
  440. +            "notNull": false
  441. +          },
  442. +          {
  443. +            "fieldPath": "symbol",
  444. +            "columnName": "symbol",
  445. +            "affinity": "TEXT",
  446. +            "notNull": false
  447. +          },
  448. +          {
  449. +            "fieldPath": "precision",
  450. +            "columnName": "precision",
  451. +            "affinity": "INTEGER",
  452. +            "notNull": true
  453. +          }
  454. +        ],
  455. +        "primaryKey": {
  456. +          "columnNames": [
  457. +            "id"
  458. +          ],
  459. +          "autoGenerate": true
  460. +        },
  461. +        "indices": [
  462. +          {
  463. +            "name": "index_asset_object_asset_id_symbol",
  464. +            "unique": true,
  465. +            "columnNames": [
  466. +              "asset_id",
  467. +              "symbol"
  468. +            ],
  469. +            "createSql": "CREATE UNIQUE INDEX `index_asset_object_asset_id_symbol` ON `${TABLE_NAME}` (`asset_id`, `symbol`)"
  470. +          }
  471. +        ],
  472. +        "foreignKeys": []
  473. +      },
  474. +      {
  475. +        "tableName": "operation_history",
  476. +        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `timestamp` INTEGER NOT NULL, `history_id` TEXT, `op` TEXT, `block_num` INTEGER, `trx_in_block` INTEGER, `op_in_trx` INTEGER, `virtual_op` INTEGER)",
  477. +        "fields": [
  478. +          {
  479. +            "fieldPath": "id",
  480. +            "columnName": "id",
  481. +            "affinity": "INTEGER",
  482. +            "notNull": true
  483. +          },
  484. +          {
  485. +            "fieldPath": "timestamp",
  486. +            "columnName": "timestamp",
  487. +            "affinity": "INTEGER",
  488. +            "notNull": true
  489. +          },
  490. +          {
  491. +            "fieldPath": "operationHistoryObject.id",
  492. +            "columnName": "history_id",
  493. +            "affinity": "TEXT",
  494. +            "notNull": false
  495. +          },
  496. +          {
  497. +            "fieldPath": "operationHistoryObject.op",
  498. +            "columnName": "op",
  499. +            "affinity": "TEXT",
  500. +            "notNull": false
  501. +          },
  502. +          {
  503. +            "fieldPath": "operationHistoryObject.block_num",
  504. +            "columnName": "block_num",
  505. +            "affinity": "INTEGER",
  506. +            "notNull": false
  507. +          },
  508. +          {
  509. +            "fieldPath": "operationHistoryObject.trx_in_block",
  510. +            "columnName": "trx_in_block",
  511. +            "affinity": "INTEGER",
  512. +            "notNull": false
  513. +          },
  514. +          {
  515. +            "fieldPath": "operationHistoryObject.op_in_trx",
  516. +            "columnName": "op_in_trx",
  517. +            "affinity": "INTEGER",
  518. +            "notNull": false
  519. +          },
  520. +          {
  521. +            "fieldPath": "operationHistoryObject.virtual_op",
  522. +            "columnName": "virtual_op",
  523. +            "affinity": "INTEGER",
  524. +            "notNull": false
  525. +          }
  526. +        ],
  527. +        "primaryKey": {
  528. +          "columnNames": [
  529. +            "id"
  530. +          ],
  531. +          "autoGenerate": true
  532. +        },
  533. +        "indices": [
  534. +          {
  535. +            "name": "index_operation_history_timestamp_history_id",
  536. +            "unique": true,
  537. +            "columnNames": [
  538. +              "timestamp",
  539. +              "history_id"
  540. +            ],
  541. +            "createSql": "CREATE UNIQUE INDEX `index_operation_history_timestamp_history_id` ON `${TABLE_NAME}` (`timestamp`, `history_id`)"
  542. +          }
  543. +        ],
  544. +        "foreignKeys": []
  545. +      },
  546. +      {
  547. +        "tableName": "account_object",
  548. +        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `account_id` TEXT, `name` TEXT)",
  549. +        "fields": [
  550. +          {
  551. +            "fieldPath": "id",
  552. +            "columnName": "id",
  553. +            "affinity": "INTEGER",
  554. +            "notNull": true
  555. +          },
  556. +          {
  557. +            "fieldPath": "account_id",
  558. +            "columnName": "account_id",
  559. +            "affinity": "TEXT",
  560. +            "notNull": false
  561. +          },
  562. +          {
  563. +            "fieldPath": "name",
  564. +            "columnName": "name",
  565. +            "affinity": "TEXT",
  566. +            "notNull": false
  567. +          }
  568. +        ],
  569. +        "primaryKey": {
  570. +          "columnNames": [
  571. +            "id"
  572. +          ],
  573. +          "autoGenerate": true
  574. +        },
  575. +        "indices": [
  576. +          {
  577. +            "name": "index_account_object_account_id_name",
  578. +            "unique": true,
  579. +            "columnNames": [
  580. +              "account_id",
  581. +              "name"
  582. +            ],
  583. +            "createSql": "CREATE UNIQUE INDEX `index_account_object_account_id_name` ON `${TABLE_NAME}` (`account_id`, `name`)"
  584. +          }
  585. +        ],
  586. +        "foreignKeys": []
  587. +      }
  588. +    ],
  589. +    "setupQueries": [
  590. +      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
  591. +      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"50adca5ce42c2b4860616029d4324041\")"
  592. +    ]
  593. +  }
  594. +}
  595. \ No newline at end of file
  596. diff --git a/bitshares_andriod_wallet/app/src/main/AndroidManifest.xml b/evraz-wallet/app/src/main/AndroidManifest.xml
  597. index 470ec8d..099348b 100644
  598. --- a/bitshares_andriod_wallet/app/src/main/AndroidManifest.xml
  599. +++ b/evraz-wallet/app/src/main/AndroidManifest.xml
  600. @@ -1,20 +1,31 @@
  601.  <?xml version="1.0" encoding="utf-8"?>
  602.  <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  603. -    package="com.bitshares.bitshareswallet">
  604. +    package="org.evrazcoin.evrazwallet">
  605.  
  606.      <uses-permission android:name="android.permission.INTERNET" />
  607.      <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
  608.      <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
  609.  
  610.      <application
  611. -        android:name=".BitsharesApplication"
  612. +        android:name="com.bitshares.bitshareswallet.BitsharesApplication"
  613.          android:allowBackup="true"
  614. -        android:icon="@mipmap/logo"
  615. +        android:icon="@mipmap/ic_launcher"
  616.          android:label="@string/app_name"
  617.          android:supportsRtl="true"
  618.          android:theme="@style/AppTheme">
  619. +       <!-- <activity
  620. +            android:name="com.bitshares.bitshareswallet.MainActivity"
  621. +            android:launchMode="singleTask"
  622. +            android:screenOrientation="portrait"
  623. +            android:windowSoftInputMode="adjustPan">
  624. +            <intent-filter>
  625. +                <action android:name="android.intent.action.MAIN" />
  626. +
  627. +                <category android:name="android.intent.category.LAUNCHER" />
  628. +            </intent-filter>
  629. +        </activity>-->
  630.          <activity
  631. -            android:name=".MainActivity"
  632. +            android:name="com.ngse.ui.NewMainActivity"
  633.              android:launchMode="singleTask"
  634.              android:screenOrientation="portrait"
  635.              android:windowSoftInputMode="adjustPan">
  636. @@ -24,39 +35,64 @@
  637.                  <category android:name="android.intent.category.LAUNCHER" />
  638.              </intent-filter>
  639.          </activity>
  640. +
  641.          <activity
  642. -            android:name=".SignUpButtonActivity"
  643. +            android:name="com.bitshares.bitshareswallet.SignUpButtonActivity"
  644.              android:configChanges="orientation|keyboardHidden|screenSize"
  645.              android:label="@string/title_activity_sign_up_button"
  646.              android:screenOrientation="portrait"
  647.              android:theme="@style/ActivityTheme" />
  648.          <activity
  649. -            android:name=".SignUpActivity"
  650. +            android:name="com.bitshares.bitshareswallet.SignUpActivity"
  651.              android:screenOrientation="portrait"
  652.              android:theme="@style/ActivityTheme" />
  653.          <activity
  654. -            android:name=".ImportActivty"
  655. +            android:name="com.bitshares.bitshareswallet.ImportActivty"
  656.              android:screenOrientation="portrait"
  657.              android:theme="@style/ActivityTheme" />
  658.          <activity
  659. -            android:name=".ModelSelectActivity"
  660. +            android:name="com.bitshares.bitshareswallet.ModelSelectActivity"
  661.              android:screenOrientation="portrait"
  662.              android:theme="@style/ActivityTheme" />
  663.  
  664.          <meta-data
  665.              android:name="io.fabric.ApiKey"
  666. -            android:value="1516f2abc1f71a4a06a0b84c26caaa01398302fb" />
  667. +            android:value="f1ec71485e34be2732f0231c939fcd2d8113fc80"
  668. +            />
  669.  
  670.          <activity
  671. -            android:name=".SettingsActivity"
  672. +            android:name="com.bitshares.bitshareswallet.SettingsActivity"
  673. +            android:theme="@style/SettingsActivityTheme"
  674.              android:screenOrientation="portrait" />
  675.          <activity
  676. -            android:name=".AboutActivity"
  677. +            android:name="com.bitshares.bitshareswallet.AboutActivity"
  678.              android:screenOrientation="portrait"
  679.              android:theme="@style/ActivityTheme" />
  680. -        <activity android:name=".CreateAccountActivity"
  681. +        <activity android:name="com.bitshares.bitshareswallet.CreateAccountActivity"
  682.              android:screenOrientation="portrait"
  683.              android:theme="@style/ActivityTheme" />
  684. +
  685. +
  686. +
  687. +        <activity
  688. +            android:name="com.ngse.ui.SignUpButtonActivity"
  689. +            android:configChanges="orientation|keyboardHidden|screenSize"
  690. +            android:label="@string/title_activity_sign_up_button"
  691. +            android:screenOrientation="portrait"
  692. +            android:theme="@style/ActivityTheme" />
  693. +
  694. +        <activity
  695. +            android:name="com.ngse.ui.SignUpInfoActivity"
  696. +            android:screenOrientation="portrait"
  697. +            android:theme="@style/ActivityTheme" />
  698. +        <activity
  699. +            android:name="com.ngse.ui.ImportActivty"
  700. +            android:screenOrientation="portrait"
  701. +            android:theme="@style/ActivityTheme" />
  702. +        <activity android:name="com.ngse.ui.CreateAccountActivity"
  703. +            android:screenOrientation="portrait"
  704. +            android:theme="@style/ActivityTheme" />
  705. +
  706.      </application>
  707.  
  708.  </manifest>
  709. \ No newline at end of file
  710. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/AboutActivity.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/AboutActivity.java
  711. index fc132c9..ced5abd 100644
  712. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/AboutActivity.java
  713. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/AboutActivity.java
  714. @@ -15,6 +15,9 @@ import android.widget.TextView;
  715.  import android.widget.Toast;
  716.  
  717.  import com.bitshares.bitshareswallet.wallet.fc.crypto.sha256_object;
  718. +import com.ngse.ui.NewMainActivity;
  719. +
  720. +import org.evrazcoin.evrazwallet.R;
  721.  
  722.  import java.util.Locale;
  723.  
  724. @@ -39,7 +42,7 @@ public class AboutActivity extends AppCompatActivity {
  725.          getSupportActionBar().setDisplayHomeAsUpEnabled(true);
  726.  
  727.          TextView textViewAccountName = (TextView)findViewById(R.id.textViewAccountName);
  728. -        final String strName = "bituniverse2017";
  729. +        final String strName = "evraz";
  730.          textViewAccountName.setText(strName);
  731.  
  732.          sha256_object.encoder encoder = new sha256_object.encoder();
  733. @@ -62,7 +65,8 @@ public class AboutActivity extends AppCompatActivity {
  734.          findViewById(R.id.btn_donate).setOnClickListener(new View.OnClickListener() {
  735.              @Override
  736.              public void onClick(View v) {
  737. -                Intent intent = new Intent(AboutActivity.this, MainActivity.class);
  738. +                Intent intent = new Intent(AboutActivity.this, NewMainActivity.class);
  739. +//                Intent intent = new Intent(AboutActivity.this, MainActivity.class);
  740.                  intent.putExtra("action", "donate");
  741.                  intent.putExtra("name", strName);
  742.                  intent.putExtra("amount", "10");
  743. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/BalancesFragment.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/BalancesFragment.java
  744. index 28e3ca0..c375538 100644
  745. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/BalancesFragment.java
  746. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/BalancesFragment.java
  747. @@ -15,6 +15,8 @@ import android.widget.TextView;
  748.  import com.bitshares.bitshareswallet.room.BitsharesBalanceAsset;
  749.  import com.bitshares.bitshareswallet.viewmodel.WalletViewModel;
  750.  
  751. +import org.evrazcoin.evrazwallet.R;
  752. +
  753.  import java.util.List;
  754.  import java.util.Locale;
  755.  
  756. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/BaseFragment.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/BaseFragment.java
  757. index dea2c9f..3a7666d 100644
  758. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/BaseFragment.java
  759. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/BaseFragment.java
  760. @@ -1,5 +1,7 @@
  761.  package com.bitshares.bitshareswallet;
  762.  
  763. +import android.os.Bundle;
  764. +import android.support.annotation.Nullable;
  765.  import android.support.v4.app.Fragment;
  766.  import android.support.v4.view.ViewPager;
  767.  import android.util.Log;
  768. @@ -17,6 +19,12 @@ public class BaseFragment extends Fragment {
  769.  
  770.      }
  771.  
  772. +    @Override
  773. +    public void onCreate(@Nullable Bundle savedInstanceState) {
  774. +        super.onCreate(savedInstanceState);
  775. +        setHasOptionsMenu(true);
  776. +    }
  777. +
  778.      @Override
  779.      public void onResume() {
  780.          super.onResume();
  781. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/BitsharesApplication.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/BitsharesApplication.java
  782. index 493e77c..0fe6063 100644
  783. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/BitsharesApplication.java
  784. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/BitsharesApplication.java
  785. @@ -5,7 +5,9 @@ import android.support.multidex.MultiDexApplication;
  786.  
  787.  import com.bitshares.bitshareswallet.room.BitsharesDatabase;
  788.  import com.crashlytics.android.Crashlytics;
  789. +import com.crashlytics.android.core.CrashlyticsCore;
  790.  
  791. +import org.evrazcoin.evrazwallet.BuildConfig;
  792.  import org.spongycastle.jce.provider.BouncyCastleProvider;
  793.  
  794.  import java.security.Security;
  795. @@ -34,13 +36,16 @@ public class BitsharesApplication extends MultiDexApplication {
  796.      @Override
  797.      public void onCreate() {
  798.          super.onCreate();
  799. -        Fabric.with(this, new Crashlytics());
  800. +        Crashlytics crashlyticsKit = new Crashlytics.Builder()
  801. +                .core(new CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build())
  802. +                .build();
  803. +        Fabric.with(this, crashlyticsKit);
  804.          Security.insertProviderAt(new BouncyCastleProvider(), 1);
  805.  
  806.          bitsharesDatabase = Room.databaseBuilder(
  807.                  this,
  808.                  BitsharesDatabase.class,
  809. -                "bitshares.db"
  810. +                "evrazwallet.db"
  811.          ).build();
  812.  
  813.          // 注册回调，保证数据更新
  814. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/CancelOrderDialog.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/CancelOrderDialog.java
  815. index bd05d98..a3fa716 100644
  816. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/CancelOrderDialog.java
  817. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/CancelOrderDialog.java
  818. @@ -9,6 +9,8 @@ import android.widget.TextView;
  819.  import com.bitshares.bitshareswallet.market.OpenOrder;
  820.  import com.bitshares.bitshareswallet.wallet.graphene.chain.utils;
  821.  
  822. +import org.evrazcoin.evrazwallet.R;
  823. +
  824.  import java.text.SimpleDateFormat;
  825.  
  826.  
  827. @@ -20,7 +22,7 @@ public class CancelOrderDialog {
  828.      private boolean confirm = false;
  829.      public CancelOrderDialog(Activity mActivity, OpenOrder order) {
  830.          this.mActivity = mActivity;
  831. -        mDialogBuilder = new AlertDialog.Builder(mActivity);
  832. +        mDialogBuilder = new AlertDialog.Builder(mActivity, R.style.CustomDialogTheme);
  833.          mDialogBuilder.setTitle(R.string.label_confirm_cancel_order);
  834.  
  835.          View view = mActivity.getLayoutInflater().inflate(R.layout.dialog_cancel_order, null);
  836. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/ConfirmOrderDialog.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/ConfirmOrderDialog.java
  837. index d8cde2f..525978f 100644
  838. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/ConfirmOrderDialog.java
  839. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/ConfirmOrderDialog.java
  840. @@ -5,6 +5,8 @@ import android.support.v7.app.AlertDialog;
  841.  import android.view.View;
  842.  import android.widget.TextView;
  843.  
  844. +import org.evrazcoin.evrazwallet.R;
  845. +
  846.  public class ConfirmOrderDialog {
  847.      private Activity mActivity;
  848.      private AlertDialog.Builder mDialogBuilder;
  849. @@ -113,7 +115,7 @@ public class ConfirmOrderDialog {
  850.      public ConfirmOrderDialog(Activity mActivity, ConfirmOrderData confirmOrderData) {
  851.          this.mActivity = mActivity;
  852.  
  853. -        mDialogBuilder = new AlertDialog.Builder(mActivity);
  854. +        mDialogBuilder = new AlertDialog.Builder(mActivity, R.style.CustomDialogTheme);
  855.          mDialogBuilder.setTitle(R.string.label_please_confirm);
  856.  
  857.          View view = mActivity.getLayoutInflater().inflate(R.layout.dialog_confirm_order, null);
  858. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/CreateAccountActivity.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/CreateAccountActivity.java
  859. index 6ab3d5e..2cc05d3 100644
  860. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/CreateAccountActivity.java
  861. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/CreateAccountActivity.java
  862. @@ -22,6 +22,8 @@ import com.bitshares.bitshareswallet.wallet.exception.NetworkStatusException;
  863.  import com.bitshares.bitshareswallet.wallet.faucet.CreateAccountException;
  864.  import com.kaopiz.kprogresshud.KProgressHUD;
  865.  
  866. +import org.evrazcoin.evrazwallet.R;
  867. +
  868.  import io.reactivex.Flowable;
  869.  import io.reactivex.Observable;
  870.  import io.reactivex.android.schedulers.AndroidSchedulers;
  871. @@ -94,7 +96,7 @@ public class CreateAccountActivity extends AppCompatActivity {
  872.                      if (checkBox.isChecked() == true) {
  873.                          processCreateAccount(strAccount, strPassword, strPasswordConfirm);
  874.                      } else {
  875. -                        AlertDialog.Builder builder = new AlertDialog.Builder(CreateAccountActivity.this);
  876. +                        AlertDialog.Builder builder = new AlertDialog.Builder(CreateAccountActivity.this, R.style.CustomDialogTheme);
  877.                          builder.setMessage(R.string.create_account_check_box_confirm);
  878.                          builder.show();
  879.                          mProcessHud.dismiss();
  880. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/ExchangeFragment.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/ExchangeFragment.java
  881. index 1c95231..9945b5e 100644
  882. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/ExchangeFragment.java
  883. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/ExchangeFragment.java
  884. @@ -10,6 +10,8 @@ import android.view.LayoutInflater;
  885.  import android.view.View;
  886.  import android.view.ViewGroup;
  887.  
  888. +import org.evrazcoin.evrazwallet.R;
  889. +
  890.  
  891.  /**
  892.   * A simple {@link Fragment} subclass.
  893. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/ImportActivty.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/ImportActivty.java
  894. index 0d8d876..fbe0abc 100644
  895. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/ImportActivty.java
  896. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/ImportActivty.java
  897. @@ -20,6 +20,8 @@ import com.bitshares.bitshareswallet.wallet.common.ConvertUriToFilePath;
  898.  import com.bitshares.bitshareswallet.wallet.common.ErrorCode;
  899.  import com.kaopiz.kprogresshud.KProgressHUD;
  900.  
  901. +import org.evrazcoin.evrazwallet.R;
  902. +
  903.  import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
  904.  import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
  905.  
  906. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/MainActivity.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/MainActivity.java
  907. index e1ab7b0..726ee72 100644
  908. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/MainActivity.java
  909. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/MainActivity.java
  910. @@ -49,6 +49,9 @@ import com.bitshares.bitshareswallet.wallet.account_object;
  911.  import com.bitshares.bitshareswallet.wallet.fc.crypto.sha256_object;
  912.  import com.bitshares.bitshareswallet.wallet.graphene.chain.signed_transaction;
  913.  import com.bitshares.bitshareswallet.wallet.graphene.chain.utils;
  914. +
  915. +import org.evrazcoin.evrazwallet.R;
  916. +
  917.  import java.util.List;
  918.  
  919.  import io.reactivex.Flowable;
  920. @@ -340,7 +343,7 @@ public class MainActivity extends AppCompatActivity
  921.      }
  922.  
  923.      private void processLogout() {
  924. -        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
  925. +        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this, R.style.CustomDialogTheme);
  926.          builder.setPositiveButton(R.string.log_out_dialog_confirm_button, new DialogInterface.OnClickListener() {
  927.              @Override
  928.              public void onClick(DialogInterface dialog, int which) {
  929. @@ -374,7 +377,7 @@ public class MainActivity extends AppCompatActivity
  930.      }
  931.  
  932.      private void processChooseCurency(){
  933. -        final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(MainActivity.this);
  934. +        final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(MainActivity.this, R.style.CustomDialogTheme);
  935.          dialogBuilder.setTitle(R.string.title_select_currency);
  936.          Resources res = getResources();
  937.          final String[] arrValues = res.getStringArray(R.array.quotation_currency_pair_values);
  938. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/ModelSelectActivity.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/ModelSelectActivity.java
  939. index 83a2dc1..1deaf44 100644
  940. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/ModelSelectActivity.java
  941. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/ModelSelectActivity.java
  942. @@ -6,6 +6,8 @@ import android.os.Bundle;
  943.  import android.support.v7.widget.Toolbar;
  944.  import android.view.View;
  945.  
  946. +import org.evrazcoin.evrazwallet.R;
  947. +
  948.  public class ModelSelectActivity extends AppCompatActivity {
  949.      private Toolbar mToolbar;
  950.  
  951. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/OrdersFragment.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/OrdersFragment.java
  952. index 85a4349..60b8a25 100644
  953. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/OrdersFragment.java
  954. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/OrdersFragment.java
  955. @@ -28,6 +28,8 @@ import com.bitshares.bitshareswallet.wallet.exception.NetworkStatusException;
  956.  import com.bitshares.bitshareswallet.wallet.graphene.chain.utils;
  957.  import com.kaopiz.kprogresshud.KProgressHUD;
  958.  
  959. +import org.evrazcoin.evrazwallet.R;
  960. +
  961.  import java.text.SimpleDateFormat;
  962.  import java.util.List;
  963.  import java.util.Locale;
  964. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/QuotationCurrencyPairAdapter.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/QuotationCurrencyPairAdapter.java
  965. index 1ba06cd..0bb9cc7 100644
  966. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/QuotationCurrencyPairAdapter.java
  967. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/QuotationCurrencyPairAdapter.java
  968. @@ -14,6 +14,8 @@ import com.bitshares.bitshareswallet.market.MarketTicker;
  969.  import com.bitshares.bitshareswallet.room.BitsharesMarketTicker;
  970.  import com.bitshares.bitshareswallet.wallet.graphene.chain.utils;
  971.  
  972. +import org.evrazcoin.evrazwallet.R;
  973. +
  974.  import java.text.DecimalFormat;
  975.  import java.util.ArrayList;
  976.  import java.util.Arrays;
  977. @@ -68,6 +70,7 @@ public class QuotationCurrencyPairAdapter extends RecyclerView.Adapter<Quotation
  978.          marrValues = context.getResources().getStringArray(R.array.quotation_currency_pair_values);
  979.          currecnyPairSet.addAll(Arrays.asList(marrValues));
  980.  
  981. +        mapSymbol2Id.put("EVRAZ", R.mipmap.evraz);
  982.          mapSymbol2Id.put("BTS", R.mipmap.bts);
  983.          mapSymbol2Id.put("BTC", R.mipmap.btc);
  984.          mapSymbol2Id.put("ETH", R.mipmap.eth);
  985. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/QuotationFragment.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/QuotationFragment.java
  986. index 2bac1dd..78339c2 100644
  987. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/QuotationFragment.java
  988. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/QuotationFragment.java
  989. @@ -34,6 +34,8 @@ import com.github.mikephil.charting.formatter.IAxisValueFormatter;
  990.  import com.github.mikephil.charting.highlight.Highlight;
  991.  import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
  992.  
  993. +import org.evrazcoin.evrazwallet.R;
  994. +
  995.  import java.text.DecimalFormat;
  996.  import java.text.SimpleDateFormat;
  997.  import java.util.ArrayList;
  998. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/SendFragment.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/SendFragment.java
  999. index 24ebd9f..dc358c3 100644
  1000. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/SendFragment.java
  1001. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/SendFragment.java
  1002. @@ -39,6 +39,8 @@ import com.bitshares.bitshareswallet.wallet.graphene.chain.signed_transaction;
  1003.  import com.bituniverse.utils.NumericUtil;
  1004.  import com.kaopiz.kprogresshud.KProgressHUD;
  1005.  
  1006. +import org.evrazcoin.evrazwallet.R;
  1007. +
  1008.  import java.util.ArrayList;
  1009.  import java.util.List;
  1010.  import java.util.Locale;
  1011. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/SettingsActivity.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/SettingsActivity.java
  1012. index d2acd04..64a8ca4 100644
  1013. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/SettingsActivity.java
  1014. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/SettingsActivity.java
  1015. @@ -5,6 +5,8 @@ import android.os.Bundle;
  1016.  import android.support.v7.widget.Toolbar;
  1017.  import android.view.View;
  1018.  
  1019. +import org.evrazcoin.evrazwallet.R;
  1020. +
  1021.  public class SettingsActivity extends AppCompatActivity {
  1022.      private Toolbar mToolbar;
  1023.  
  1024. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/SettingsFragment.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/SettingsFragment.java
  1025. index 7e5f71a..a9b8c1a 100644
  1026. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/SettingsFragment.java
  1027. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/SettingsFragment.java
  1028. @@ -11,6 +11,8 @@ import android.view.LayoutInflater;
  1029.  import android.view.View;
  1030.  import android.view.ViewGroup;
  1031.  
  1032. +import org.evrazcoin.evrazwallet.R;
  1033. +
  1034.  
  1035.  public class SettingsFragment extends PreferenceFragmentCompat {
  1036.  
  1037. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/SignUpActivity.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/SignUpActivity.java
  1038. index ad5817e..01a556b 100644
  1039. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/SignUpActivity.java
  1040. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/SignUpActivity.java
  1041. @@ -3,6 +3,8 @@ package com.bitshares.bitshareswallet;
  1042.  import android.support.v7.app.AppCompatActivity;
  1043.  import android.os.Bundle;
  1044.  
  1045. +import org.evrazcoin.evrazwallet.R;
  1046. +
  1047.  public class SignUpActivity extends AppCompatActivity {
  1048.  
  1049.      @Override
  1050. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/SignUpButtonActivity.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/SignUpButtonActivity.java
  1051. index 8549d44..cfc3847 100644
  1052. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/SignUpButtonActivity.java
  1053. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/SignUpButtonActivity.java
  1054. @@ -9,6 +9,8 @@ import android.os.Handler;
  1055.  import android.view.MotionEvent;
  1056.  import android.view.View;
  1057.  
  1058. +import org.evrazcoin.evrazwallet.R;
  1059. +
  1060.  /**
  1061.   * An example full-screen activity that shows and hides the system UI (i.e.
  1062.   * status bar and navigation/system bar) with user interaction.
  1063. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/TranactionsAdapter.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/TranactionsAdapter.java
  1064. index 3b2ffa7..0119288 100644
  1065. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/TranactionsAdapter.java
  1066. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/TranactionsAdapter.java
  1067. @@ -21,6 +21,8 @@ import com.bitshares.bitshareswallet.wallet.graphene.chain.config;
  1068.  import com.bitshares.bitshareswallet.wallet.graphene.chain.memo_data;
  1069.  import com.bitshares.bitshareswallet.wallet.graphene.chain.operations;
  1070.  
  1071. +import org.evrazcoin.evrazwallet.R;
  1072. +
  1073.  import java.util.Locale;
  1074.  
  1075.  /**
  1076. @@ -151,7 +153,7 @@ class TranactionsAdapter extends RecyclerView.Adapter<TranactionsAdapter.Transac
  1077.          operations.account_create_operation operation = (operations.account_create_operation) operationType.operationContent;
  1078.          String strRegistarName = operationHistoryWrapper.mapId2AccountObject.get(operation.registrar).name;
  1079.  
  1080. -        String strTransferFormat = "<font color=\'#2d95ff\'>%s</font> registered the account <font color=\'#2d95ff\'>%s</font>";
  1081. +        String strTransferFormat = "<font color=\'#FFAB40\'>%s</font> registered the account <font color=\'#FFAB40\'>%s</font>";
  1082.          String strResult = String.format(
  1083.                  Locale.ENGLISH,
  1084.                  strTransferFormat,
  1085. @@ -173,7 +175,7 @@ class TranactionsAdapter extends RecyclerView.Adapter<TranactionsAdapter.Transac
  1086.          String strTo = operationHistoryWrapper.mapId2AccountObject.get(operation.to).name;
  1087.          BitsharesAssetObject bitsharesAssetObject = operationHistoryWrapper.mapId2AssetObject.get(operation.amount.asset_id);
  1088.  
  1089. -        String strTransferFormat = "<font color=\'#2d95ff\'>%s</font> sent <font color=\'#000000\'>%s %s</font> to <font color=\'#2d95ff\'>%s</font>";
  1090. +        String strTransferFormat = "<font color=\'#FFAB40\'>%s</font> sent <font color=\'#000000\'>%s %s</font> to <font color=\'#FFAB40\'>%s</font>";
  1091.  
  1092.          String strResult = String.format(
  1093.                  Locale.ENGLISH, strTransferFormat,
  1094. @@ -190,7 +192,7 @@ class TranactionsAdapter extends RecyclerView.Adapter<TranactionsAdapter.Transac
  1095.      }
  1096.  
  1097.      private void processMemoUnlockClick() {
  1098. -        AlertDialog.Builder builder = new AlertDialog.Builder(transactionsFragment.getActivity());
  1099. +        AlertDialog.Builder builder = new AlertDialog.Builder(transactionsFragment.getActivity(), R.style.CustomDialogTheme);
  1100.          LayoutInflater layoutInflater = transactionsFragment.getActivity().getLayoutInflater();
  1101.          final View viewGroup = layoutInflater.inflate(R.layout.dialog_password_unlock, null);
  1102.          builder.setPositiveButton(
  1103. @@ -251,7 +253,7 @@ class TranactionsAdapter extends RecyclerView.Adapter<TranactionsAdapter.Transac
  1104.                  layoutTransaction.setOnClickListener(new View.OnClickListener() {
  1105.                      @Override
  1106.                      public void onClick(View v) {
  1107. -                        AlertDialog.Builder builder = new AlertDialog.Builder(transactionsFragment.getActivity());
  1108. +                        AlertDialog.Builder builder = new AlertDialog.Builder(transactionsFragment.getActivity(), R.style.CustomDialogTheme);
  1109.                          builder.setMessage(strMemo);
  1110.                          builder.show();
  1111.                      }
  1112. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyFragment.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyFragment.java
  1113. index 1ed8c02..2e68ba3 100644
  1114. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyFragment.java
  1115. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyFragment.java
  1116. @@ -37,6 +37,8 @@ import com.bituniverse.network.Status;
  1117.  import com.bituniverse.utils.NumericUtil;
  1118.  import com.kaopiz.kprogresshud.KProgressHUD;
  1119.  
  1120. +import org.evrazcoin.evrazwallet.R;
  1121. +
  1122.  import java.text.DecimalFormat;
  1123.  import java.text.SimpleDateFormat;
  1124.  import java.util.Calendar;
  1125. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyPasswordDialog.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyPasswordDialog.java
  1126. index 20bfb65..6b8bc6f 100644
  1127. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyPasswordDialog.java
  1128. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyPasswordDialog.java
  1129. @@ -6,6 +6,8 @@ import android.view.View;
  1130.  import android.widget.EditText;
  1131.  import android.widget.TextView;
  1132.  
  1133. +import org.evrazcoin.evrazwallet.R;
  1134. +
  1135.  public class TransactionSellBuyPasswordDialog {
  1136.      private Activity mActivity;
  1137.      private AlertDialog.Builder mDialogBuilder;
  1138. @@ -16,7 +18,7 @@ public class TransactionSellBuyPasswordDialog {
  1139.      public TransactionSellBuyPasswordDialog(Activity mActivity) {
  1140.          this.mActivity = mActivity;
  1141.  
  1142. -        mDialogBuilder = new AlertDialog.Builder(mActivity);
  1143. +        mDialogBuilder = new AlertDialog.Builder(mActivity, R.style.CustomDialogTheme);
  1144.  
  1145.          View view = mActivity.getLayoutInflater().inflate(R.layout.dialog_transaction_password_order, null);
  1146.          editTextPassword = (EditText)view.findViewById(R.id.editTextPassword);
  1147. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyRecyclerViewAdapter.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyRecyclerViewAdapter.java
  1148. index b727bb9..bd24687 100644
  1149. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyRecyclerViewAdapter.java
  1150. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyRecyclerViewAdapter.java
  1151. @@ -8,6 +8,8 @@ import android.widget.TextView;
  1152.  
  1153.  import com.bitshares.bitshareswallet.market.Order;
  1154.  
  1155. +import org.evrazcoin.evrazwallet.R;
  1156. +
  1157.  import java.text.DecimalFormat;
  1158.  import java.util.List;
  1159.  
  1160. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/TransactionsFragment.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/TransactionsFragment.java
  1161. index 090770d..76324d5 100644
  1162. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/TransactionsFragment.java
  1163. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/TransactionsFragment.java
  1164. @@ -15,6 +15,8 @@ import android.widget.TextView;
  1165.  
  1166.  import com.bitshares.bitshareswallet.viewmodel.TransactionViewModel;
  1167.  
  1168. +import org.evrazcoin.evrazwallet.R;
  1169. +
  1170.  import butterknife.BindView;
  1171.  import butterknife.ButterKnife;
  1172.  
  1173. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/WalletFragment.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/WalletFragment.java
  1174. index e3533c7..982b1d7 100644
  1175. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/WalletFragment.java
  1176. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/WalletFragment.java
  1177. @@ -21,6 +21,8 @@ import android.widget.TextView;
  1178.  import com.bitshares.bitshareswallet.room.BitsharesBalanceAsset;
  1179.  import com.bitshares.bitshareswallet.viewmodel.WalletViewModel;
  1180.  
  1181. +import org.evrazcoin.evrazwallet.R;
  1182. +
  1183.  import java.util.List;
  1184.  import java.util.Locale;
  1185.  
  1186. @@ -168,7 +170,7 @@ public class WalletFragment extends BaseFragment {
  1187.      }
  1188.  
  1189.      void processError() {
  1190. -        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
  1191. +        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.CustomDialogTheme);
  1192.          builder.setPositiveButton(R.string.connect_fail_dialog_retry, new DialogInterface.OnClickListener() {
  1193.              @Override
  1194.              public void onClick(DialogInterface dialog, int which) {
  1195. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/repository/MarketTickerRepository.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/repository/MarketTickerRepository.java
  1196. index 2c40695..a523541 100644
  1197. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/repository/MarketTickerRepository.java
  1198. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/repository/MarketTickerRepository.java
  1199. @@ -5,7 +5,7 @@ import android.arch.lifecycle.MediatorLiveData;
  1200.  import android.util.Pair;
  1201.  
  1202.  import com.bitshares.bitshareswallet.BitsharesApplication;
  1203. -import com.bitshares.bitshareswallet.R;
  1204. +import org.evrazcoin.evrazwallet.R;
  1205.  import com.bitshares.bitshareswallet.market.MarketTicker;
  1206.  import com.bitshares.bitshareswallet.room.BitsharesAssetObject;
  1207.  import com.bitshares.bitshareswallet.room.BitsharesBalanceAsset;
  1208. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/room/BitsharesBalanceAsset.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/room/BitsharesBalanceAsset.java
  1209. index 872e383..820ded9 100644
  1210. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/room/BitsharesBalanceAsset.java
  1211. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/room/BitsharesBalanceAsset.java
  1212. @@ -1,8 +1,5 @@
  1213.  package com.bitshares.bitshareswallet.room;
  1214.  
  1215. -import com.bitshares.bitshareswallet.wallet.graphene.chain.asset_object;
  1216. -import com.bitshares.bitshareswallet.wallet.graphene.chain.object_id;
  1217. -
  1218.  /**
  1219.   * Created by lorne on 31/10/2017.
  1220.   */
  1221. @@ -19,5 +16,17 @@ public class BitsharesBalanceAsset {
  1222.      public long balance;
  1223.      public long currency_precision;
  1224.  
  1225. -
  1226. +    @Override
  1227. +    public String toString() {
  1228. +        return "id =" + id + "\n" +
  1229. +                "amount =" + amount + "\n" +
  1230. +                "base =" + base + "\n" +
  1231. +                "base_precision =" + base_precision + "\n" +
  1232. +                "quote =" + quote + "\n" +
  1233. +                "total =" + total + "\n" +
  1234. +                "quote_precision =" + quote_precision + "\n" +
  1235. +                "currency =" + currency + "\n" +
  1236. +                "balance =" + balance + "\n" +
  1237. +                "currency_precision =" + currency_precision + "\n";
  1238. +    }
  1239.  }
  1240. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/wallet/BitsharesWalletWraper.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/wallet/BitsharesWalletWraper.java
  1241. index a8f202c..9eb5f7a 100644
  1242. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/wallet/BitsharesWalletWraper.java
  1243. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/wallet/BitsharesWalletWraper.java
  1244. @@ -5,7 +5,7 @@ import android.support.v7.preference.PreferenceManager;
  1245.  import android.util.Pair;
  1246.  
  1247.  import com.bitshares.bitshareswallet.BitsharesApplication;
  1248. -import com.bitshares.bitshareswallet.R;
  1249. +import org.evrazcoin.evrazwallet.R;
  1250.  import com.bitshares.bitshareswallet.market.MarketTicker;
  1251.  import com.bitshares.bitshareswallet.market.MarketTrade;
  1252.  import com.bitshares.bitshareswallet.wallet.common.ErrorCode;
  1253. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/wallet/FullNodeServerSelect.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/wallet/FullNodeServerSelect.java
  1254. index 23a5ade..6092d8b 100644
  1255. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/wallet/FullNodeServerSelect.java
  1256. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/wallet/FullNodeServerSelect.java
  1257. @@ -53,7 +53,7 @@ public class FullNodeServerSelect {
  1258.          final List<String> listSelectedServer = new ArrayList<>();
  1259.          for (final String strServer : mListNode) {
  1260.              Request request = new Request.Builder().url(strServer).build();
  1261. -            OkHttpClient okHttpClient = new OkHttpClient();
  1262. +            OkHttpClient okHttpClient =  websocket_api.provideOkHttpBuilder().build();//new OkHttpClient();
  1263.              WebSocket webSocket = okHttpClient.newWebSocket(request, new WebSocketListener() {
  1264.                  @Override
  1265.                  public void onFailure(WebSocket webSocket, Throwable t, Response response) {
  1266. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/wallet/wallet_api.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/wallet/wallet_api.java
  1267. index d612ea3..b0a9f59 100644
  1268. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/wallet/wallet_api.java
  1269. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/wallet/wallet_api.java
  1270. @@ -1056,7 +1056,7 @@ public class wallet_api {
  1271.                  "https://openledger.io/api/v1/accounts",
  1272.                  "https://openledger.hk/api/v1/accounts"
  1273.          };*/
  1274. -        String[] strAddress = {"https://openledger.io/api/v1/accounts"};
  1275. +        String[] strAddress = {"https://faucet.evrazcoin.org/api/v1/accounts"};
  1276.  
  1277.          int nRet = -1;
  1278.          for (int i = 0; i < strAddress.length; ++i) {
  1279. @@ -1112,7 +1112,7 @@ public class wallet_api {
  1280.          createAccountObject.owner_key = publicOwnerKeyType;
  1281.          createAccountObject.memo_key = publicActiveKeyType;
  1282.          createAccountObject.refcode = null;
  1283. -        createAccountObject.referrer = "bituniverse";
  1284. +        createAccountObject.referrer = "evraz";
  1285.          Gson gson = global_config_object.getInstance().getGsonBuilder().create();
  1286.  
  1287.          String strAddress = strServerUrl;
  1288. diff --git a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/wallet/websocket_api.java b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/wallet/websocket_api.java
  1289. index f6e1f65..2f22680 100644
  1290. --- a/bitshares_andriod_wallet/app/src/main/java/com/bitshares/bitshareswallet/wallet/websocket_api.java
  1291. +++ b/evraz-wallet/app/src/main/java/com/bitshares/bitshareswallet/wallet/websocket_api.java
  1292. @@ -28,6 +28,7 @@ import com.google.gson.JsonObject;
  1293.  import com.google.gson.JsonParseException;
  1294.  import com.google.gson.JsonSyntaxException;
  1295.  import com.google.gson.reflect.TypeToken;
  1296. +import com.ngse.utility.DebugUtility;
  1297.  
  1298.  import org.json.JSONException;
  1299.  import org.json.JSONObject;
  1300. @@ -51,6 +52,7 @@ import okhttp3.Request;
  1301.  import okhttp3.Response;
  1302.  import okhttp3.WebSocket;
  1303.  import okhttp3.WebSocketListener;
  1304. +import okhttp3.logging.HttpLoggingInterceptor;
  1305.  import okio.ByteString;
  1306.  
  1307.  import static com.bitshares.bitshareswallet.wallet.common.ErrorCode.*;
  1308. @@ -60,7 +62,7 @@ public class websocket_api extends WebSocketListener {
  1309.          void onNoticeMessage(BitsharesNoticeMessage message);
  1310.          void onDisconnect();
  1311.      }
  1312. -
  1313. +    private static final String TAG = websocket_api.class.getName();
  1314.  
  1315.      private int _nDatabaseId = -1;
  1316.      private int _nHistoryId = -1;
  1317. @@ -351,7 +353,7 @@ public class websocket_api extends WebSocketListener {
  1318.          }
  1319.  
  1320.          Request request = new Request.Builder().url(strServer).build();
  1321. -        mOkHttpClient = new OkHttpClient();
  1322. +        mOkHttpClient =  provideOkHttpBuilder().build();//new OkHttpClient();
  1323.          mWebsocket = mOkHttpClient.newWebSocket(request, this);
  1324.          synchronized (mWebsocket) {
  1325.              if (mnConnectStatus == WEBSOCKET_CONNECT_INVALID) {
  1326. @@ -408,7 +410,16 @@ public class websocket_api extends WebSocketListener {
  1327.  
  1328.          return nRet;
  1329.      }
  1330. +    public static OkHttpClient.Builder provideOkHttpBuilder() {
  1331. +        return new OkHttpClient.Builder()
  1332. +                .addInterceptor(provideHttpLoggingInterceptor());
  1333. +    }
  1334.  
  1335. +    private static HttpLoggingInterceptor provideHttpLoggingInterceptor() {
  1336. +        HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor(message -> DebugUtility.logApi(TAG, message));//
  1337. +        httpLoggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
  1338. +        return httpLoggingInterceptor;
  1339. +    }
  1340.      public synchronized int close() {
  1341.          synchronized (mHashMapIdToProcess) {
  1342.              for (Map.Entry<Integer, IReplyObjectProcess> entry : mHashMapIdToProcess.entrySet()) {
  1343. diff --git a/evraz-wallet/app/src/main/res/drawable/btn_default_background.xml b/evraz-wallet/app/src/main/res/drawable/btn_default_background.xml
  1344. new file mode 100644
  1345. index 0000000..4639c03
  1346. --- /dev/null
  1347. +++ b/evraz-wallet/app/src/main/res/drawable/btn_default_background.xml
  1348. @@ -0,0 +1,10 @@
  1349. +<?xml version="1.0" encoding="UTF-8"?>
  1350. +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  1351. +    <item>
  1352. +        <shape xmlns:android="http://schemas.android.com/apk/res/android">
  1353. +            <corners android:radius="3dp" />
  1354. +            <solid android:color="@color/gray_color" />
  1355. +        </shape>
  1356. +    </item>
  1357. +
  1358. +</selector>
  1359. \ No newline at end of file
  1360. diff --git a/evraz-wallet/app/src/main/res/drawable/btn_default_background_selector.xml b/evraz-wallet/app/src/main/res/drawable/btn_default_background_selector.xml
  1361. new file mode 100644
  1362. index 0000000..4548b7a
  1363. --- /dev/null
  1364. +++ b/evraz-wallet/app/src/main/res/drawable/btn_default_background_selector.xml
  1365. @@ -0,0 +1,15 @@
  1366. +<?xml version="1.0" encoding="utf-8"?>
  1367. +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  1368. +    <item android:state_pressed="true">
  1369. +        <shape xmlns:android="http://schemas.android.com/apk/res/android" >
  1370. +            <corners android:radius="2dp" />
  1371. +            <solid android:color="@color/light_gray_color" />
  1372. +        </shape>
  1373. +    </item>
  1374. +    <item android:state_pressed="false">
  1375. +        <shape xmlns:android="http://schemas.android.com/apk/res/android" >
  1376. +            <corners android:radius="2dp" />
  1377. +            <solid android:color="@color/gray_color" />
  1378. +        </shape>
  1379. +    </item>
  1380. +</selector>
  1381. \ No newline at end of file
  1382. diff --git a/evraz-wallet/app/src/main/res/drawable/btn_green_background.xml b/evraz-wallet/app/src/main/res/drawable/btn_green_background.xml
  1383. new file mode 100644
  1384. index 0000000..7bb538e
  1385. --- /dev/null
  1386. +++ b/evraz-wallet/app/src/main/res/drawable/btn_green_background.xml
  1387. @@ -0,0 +1,10 @@
  1388. +<?xml version="1.0" encoding="UTF-8"?>
  1389. +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  1390. +    <item>
  1391. +        <shape xmlns:android="http://schemas.android.com/apk/res/android">
  1392. +            <corners android:radius="3dp" />
  1393. +            <solid android:color="@color/light_green_color" />
  1394. +        </shape>
  1395. +    </item>
  1396. +
  1397. +</selector>
  1398. \ No newline at end of file
  1399. diff --git a/evraz-wallet/app/src/main/res/drawable/btn_red_background.xml b/evraz-wallet/app/src/main/res/drawable/btn_red_background.xml
  1400. new file mode 100644
  1401. index 0000000..683b8f8
  1402. --- /dev/null
  1403. +++ b/evraz-wallet/app/src/main/res/drawable/btn_red_background.xml
  1404. @@ -0,0 +1,10 @@
  1405. +<?xml version="1.0" encoding="UTF-8"?>
  1406. +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  1407. +    <item>
  1408. +        <shape xmlns:android="http://schemas.android.com/apk/res/android">
  1409. +            <corners android:radius="3dp" />
  1410. +            <solid android:color="@color/light_red_color" />
  1411. +        </shape>
  1412. +    </item>
  1413. +
  1414. +</selector>
  1415. \ No newline at end of file
  1416. diff --git a/bitshares_andriod_wallet/app/src/main/res/drawable/button_background_normal.xml b/evraz-wallet/app/src/main/res/drawable/button_background_normal.xml
  1417. index 3986e53..eacafd2 100644
  1418. --- a/bitshares_andriod_wallet/app/src/main/res/drawable/button_background_normal.xml
  1419. +++ b/evraz-wallet/app/src/main/res/drawable/button_background_normal.xml
  1420. @@ -2,6 +2,6 @@
  1421.  <shape
  1422.      xmlns:android="http://schemas.android.com/apk/res/android"
  1423.      android:shape="rectangle">
  1424. -    <solid android:color="#009933" />
  1425. +    <solid android:color="@color/colorAccent" />
  1426.      <corners android:radius="4dp" />
  1427.  </shape>
  1428. diff --git a/bitshares_andriod_wallet/app/src/main/res/drawable/button_small_background.xml b/evraz-wallet/app/src/main/res/drawable/button_small_background.xml
  1429. index 9768d8b..1051691 100644
  1430. --- a/bitshares_andriod_wallet/app/src/main/res/drawable/button_small_background.xml
  1431. +++ b/evraz-wallet/app/src/main/res/drawable/button_small_background.xml
  1432. @@ -2,6 +2,6 @@
  1433.  <shape
  1434.      xmlns:android="http://schemas.android.com/apk/res/android"
  1435.      android:shape="rectangle">
  1436. -    <solid android:color="#009933" />
  1437. +    <solid android:color="@color/colorAccent" />
  1438.      <corners android:radius="5dp" />
  1439.  </shape>
  1440. diff --git a/evraz-wallet/app/src/main/res/drawable/cusrom_switch_text_color.xml b/evraz-wallet/app/src/main/res/drawable/cusrom_switch_text_color.xml
  1441. new file mode 100644
  1442. index 0000000..d9f9df8
  1443. --- /dev/null
  1444. +++ b/evraz-wallet/app/src/main/res/drawable/cusrom_switch_text_color.xml
  1445. @@ -0,0 +1,5 @@
  1446. +<?xml version="1.0" encoding="utf-8"?>
  1447. +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  1448. +    <item android:color="@android:color/black" android:state_checked="true" />
  1449. +    <item android:color="@color/beige_color" android:state_checked="false" />
  1450. +</selector>
  1451. \ No newline at end of file
  1452. diff --git a/evraz-wallet/app/src/main/res/drawable/custom_switch_item_background.xml b/evraz-wallet/app/src/main/res/drawable/custom_switch_item_background.xml
  1453. new file mode 100644
  1454. index 0000000..c9a60ee
  1455. --- /dev/null
  1456. +++ b/evraz-wallet/app/src/main/res/drawable/custom_switch_item_background.xml
  1457. @@ -0,0 +1,9 @@
  1458. +<?xml version="1.0" encoding="utf-8"?>
  1459. +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  1460. +    <item android:state_checked="true">
  1461. +        <shape xmlns:android="http://schemas.android.com/apk/res/android" >
  1462. +            <corners android:radius="2dp" />
  1463. +            <solid android:color="#938e8e" />
  1464. +        </shape>
  1465. +    </item>
  1466. +</selector>
  1467. \ No newline at end of file
  1468. diff --git a/evraz-wallet/app/src/main/res/drawable/edit_text_default_background.xml b/evraz-wallet/app/src/main/res/drawable/edit_text_default_background.xml
  1469. new file mode 100644
  1470. index 0000000..4639c03
  1471. --- /dev/null
  1472. +++ b/evraz-wallet/app/src/main/res/drawable/edit_text_default_background.xml
  1473. @@ -0,0 +1,10 @@
  1474. +<?xml version="1.0" encoding="UTF-8"?>
  1475. +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  1476. +    <item>
  1477. +        <shape xmlns:android="http://schemas.android.com/apk/res/android">
  1478. +            <corners android:radius="3dp" />
  1479. +            <solid android:color="@color/gray_color" />
  1480. +        </shape>
  1481. +    </item>
  1482. +
  1483. +</selector>
  1484. \ No newline at end of file
  1485. diff --git a/evraz-wallet/app/src/main/res/drawable/ic_krestik.xml b/evraz-wallet/app/src/main/res/drawable/ic_krestik.xml
  1486. new file mode 100644
  1487. index 0000000..d6f684d
  1488. --- /dev/null
  1489. +++ b/evraz-wallet/app/src/main/res/drawable/ic_krestik.xml
  1490. @@ -0,0 +1,17 @@
  1491. +<vector xmlns:android="http://schemas.android.com/apk/res/android"
  1492. +    android:width="11dp"
  1493. +    android:height="11dp"
  1494. +    android:viewportWidth="1100"
  1495. +    android:viewportHeight="1100">
  1496. +  <path
  1497. +      android:fillColor="#FF000000"
  1498. +      android:pathData="M550,50c276.14,0 500,223.86 500,500 0,276.14 -223.86,500 -500,500 -276.14,0 -500,-223.86 -500,-500 0,-276.14 223.86,-500 500,-500z"/>
  1499. +  <path
  1500. +      android:pathData="M825.92,827.94l-596.54,-502.86l44.7,-53.02l596.54,502.86z"
  1501. +      android:fillColor="#F07777"
  1502. +      android:fillType="nonZero"/>
  1503. +  <path
  1504. +      android:pathData="M274.08,827.94l-44.7,-53.02l596.54,-502.86l44.7,53.02z"
  1505. +      android:fillColor="#F07777"
  1506. +      android:fillType="nonZero"/>
  1507. +</vector>
  1508. diff --git a/evraz-wallet/app/src/main/res/drawable/ic_logo_evraz.xml b/evraz-wallet/app/src/main/res/drawable/ic_logo_evraz.xml
  1509. new file mode 100644
  1510. index 0000000..3af5110
  1511. --- /dev/null
  1512. +++ b/evraz-wallet/app/src/main/res/drawable/ic_logo_evraz.xml
  1513. @@ -0,0 +1,40 @@
  1514. +<vector xmlns:android="http://schemas.android.com/apk/res/android"
  1515. +    android:width="51dp"
  1516. +    android:height="17dp"
  1517. +    android:viewportWidth="5100"
  1518. +    android:viewportHeight="1700">
  1519. +  <path
  1520. +      android:fillColor="#FF000000"
  1521. +      android:pathData="M2488.99,754.57l72.22,0l-412.72,859.83l-68.78,0l-412.72,-859.83l72.23,0l374.88,789.32z"/>
  1522. +  <path
  1523. +      android:pathData="M2488.99,754.57l72.22,0l-412.72,859.83l-68.78,0l-412.72,-859.83l72.23,0l374.88,789.32z"
  1524. +      android:fillColor="#FAEFC3"
  1525. +      android:fillType="nonZero"/>
  1526. +  <path
  1527. +      android:fillColor="#FF000000"
  1528. +      android:pathData="M3111.49,823.36c-52.73,0 -102.03,9.74 -147.89,29.23 -45.86,19.49 -85.98,46.43 -120.37,80.83 -34.4,34.39 -61.34,74.51 -80.83,120.37 -19.49,45.86 -29.23,95.16 -29.23,147.89l0,412.72 -68.79,0 0,-412.72c0,-61.91 11.75,-120.09 35.26,-174.54 23.5,-54.46 55.31,-101.75 95.44,-141.87 40.12,-40.13 87.41,-71.94 141.87,-95.44 54.45,-23.51 112.64,-35.26 174.54,-35.26l0,68.79z"/>
  1529. +  <path
  1530. +      android:pathData="M3111.49,823.36c-52.73,0 -102.03,9.74 -147.89,29.23 -45.86,19.49 -85.98,46.43 -120.37,80.83 -34.4,34.39 -61.34,74.51 -80.83,120.37 -19.49,45.86 -29.23,95.16 -29.23,147.89l0,412.72 -68.79,0 0,-412.72c0,-61.91 11.75,-120.09 35.26,-174.54 23.5,-54.46 55.31,-101.75 95.44,-141.87 40.12,-40.13 87.41,-71.94 141.87,-95.44 54.45,-23.51 112.64,-35.26 174.54,-35.26l0,68.79z"
  1531. +      android:fillColor="#FAEFC3"
  1532. +      android:fillType="nonZero"/>
  1533. +  <path
  1534. +      android:fillColor="#FF000000"
  1535. +      android:pathData="M4091.69,1614.4l-68.79,0 0,-249.35c-32.1,79.1 -82.25,143.3 -150.47,192.6 -68.21,49.3 -146.45,73.94 -234.73,73.94 -59.61,0 -116.07,-11.75 -169.38,-35.25 -53.31,-23.5 -100.03,-55.31 -140.16,-95.44 -40.12,-40.12 -71.93,-87.41 -95.44,-141.87 -23.5,-54.46 -35.25,-112.64 -35.25,-174.54 0,-61.91 11.75,-120.09 35.25,-174.55 23.51,-54.45 55.32,-101.74 95.44,-141.87 40.13,-40.13 87.42,-71.94 141.88,-95.44 54.45,-23.5 112.63,-35.25 174.54,-35.25 61.91,0 120.09,11.75 174.55,35.25 54.45,23.5 101.74,55.31 141.87,95.44 40.12,40.13 71.93,87.42 95.44,141.87 23.5,54.46 35.25,112.64 35.25,174.55l0,429.91zM3266.26,1184.49c0,52.73 9.74,102.31 29.23,148.75 19.49,46.42 46.43,86.84 80.83,121.23 34.39,34.39 74.51,61.62 120.37,81.68 45.86,20.07 95.16,30.1 147.89,30.1 52.74,0 102.03,-10.03 147.89,-30.1 45.86,-20.06 85.98,-47.29 120.38,-81.68 34.39,-34.39 61.33,-74.81 80.82,-121.23 19.49,-46.44 29.23,-96.02 29.23,-148.75 0,-52.74 -9.74,-102.32 -29.23,-148.75 -19.49,-46.44 -46.43,-86.85 -80.82,-121.24 -34.4,-34.39 -74.52,-61.62 -120.38,-81.68 -45.86,-20.07 -95.15,-30.1 -147.89,-30.1 -52.73,0 -102.03,10.03 -147.89,30.1 -45.86,20.06 -85.98,47.29 -120.37,81.68 -34.4,34.39 -61.34,74.8 -80.83,121.24 -19.49,46.43 -29.23,96.01 -29.23,148.75z"/>
  1536. +  <path
  1537. +      android:pathData="M4091.69,1614.4l-68.79,0 0,-249.35c-32.1,79.1 -82.25,143.3 -150.47,192.6 -68.21,49.3 -146.45,73.94 -234.73,73.94 -59.61,0 -116.07,-11.75 -169.38,-35.25 -53.31,-23.5 -100.03,-55.31 -140.16,-95.44 -40.12,-40.12 -71.93,-87.41 -95.44,-141.87 -23.5,-54.46 -35.25,-112.64 -35.25,-174.54 0,-61.91 11.75,-120.09 35.25,-174.55 23.51,-54.45 55.32,-101.74 95.44,-141.87 40.13,-40.13 87.42,-71.94 141.88,-95.44 54.45,-23.5 112.63,-35.25 174.54,-35.25 61.91,0 120.09,11.75 174.55,35.25 54.45,23.5 101.74,55.31 141.87,95.44 40.12,40.13 71.93,87.42 95.44,141.87 23.5,54.46 35.25,112.64 35.25,174.55l0,429.91zM3266.26,1184.49c0,52.73 9.74,102.31 29.23,148.75 19.49,46.42 46.43,86.84 80.83,121.23 34.39,34.39 74.51,61.62 120.37,81.68 45.86,20.07 95.16,30.1 147.89,30.1 52.74,0 102.03,-10.03 147.89,-30.1 45.86,-20.06 85.98,-47.29 120.38,-81.68 34.39,-34.39 61.33,-74.81 80.82,-121.23 19.49,-46.44 29.23,-96.02 29.23,-148.75 0,-52.74 -9.74,-102.32 -29.23,-148.75 -19.49,-46.44 -46.43,-86.85 -80.82,-121.24 -34.4,-34.39 -74.52,-61.62 -120.38,-81.68 -45.86,-20.07 -95.15,-30.1 -147.89,-30.1 -52.73,0 -102.03,10.03 -147.89,30.1 -45.86,20.06 -85.98,47.29 -120.37,81.68 -34.4,34.39 -61.34,74.8 -80.83,121.24 -19.49,46.43 -29.23,96.01 -29.23,148.75z"
  1538. +      android:fillColor="#FAEFC3"
  1539. +      android:fillType="nonZero"/>
  1540. +  <path
  1541. +      android:fillColor="#FF000000"
  1542. +      android:pathData="M5054.69,1549.05l0,65.35l-773.84,0l0,-65.35l687.86,-729.13l-687.86,0l0,-65.35l773.84,0l0,65.35l-687.86,729.13z"/>
  1543. +  <path
  1544. +      android:pathData="M5054.69,1549.05l0,65.35l-773.84,0l0,-65.35l687.86,-729.13l-687.86,0l0,-65.35l773.84,0l0,65.35l-687.86,729.13z"
  1545. +      android:fillColor="#FAEFC3"
  1546. +      android:fillType="nonZero"/>
  1547. +  <path
  1548. +      android:fillColor="#FAEFC3"
  1549. +      android:pathData="M1401.66,1245.31c-30.39,58.2 -68.14,111.11 -111.76,157.81 -44.42,47.54 -94.97,88.7 -150.07,122.45 -56.05,34.35 -116.79,61.04 -180.56,79.04 -62.59,17.67 -128.1,26.98 -194.94,26.98 -97.36,0 -190.24,-19.37 -274.95,-54.46 -88,-36.45 -167.18,-89.86 -233.46,-156.14 -130.11,-130.1 -210.6,-309.87 -210.6,-508.41 0,-97.36 19.37,-190.23 54.46,-274.95 36.44,-88 89.86,-167.18 156.14,-233.46 66.27,-66.27 145.46,-119.69 233.46,-156.14 84.72,-35.09 177.59,-54.46 274.95,-54.46 97.36,0 190.24,19.37 274.95,54.46 87.99,36.45 167.18,89.86 233.46,156.14 70.26,70.26 130.09,164.26 168.11,265.5 34.91,93.01 54.09,192.62 41.78,291.75l-588.79,0 0,183.84 -71.75,0 0,-183.84 -124.6,0 0,183.84 -71.74,0 0,-183.84 -470.22,0c5.77,72.95 24.35,142.29 53.5,205.76 30.45,66.33 72.47,126.28 123.44,177.26 56.31,56.31 123.58,101.68 198.29,132.63 71.93,29.79 150.82,46.24 233.57,46.24 56.96,0 112.7,-7.9 165.88,-22.88 54.21,-15.28 105.81,-37.92 153.37,-67.06 38.94,-23.87 75.24,-52.13 108.08,-84.31 32.44,-31.77 61.54,-67.37 86.55,-106.34l0.77,-1.2 124.66,0 -1.98,3.79zM824.69,675.41l69.15,0 0,179.41 478.53,0c-6.68,-71.21 -25.6,-138.89 -54.62,-200.88 -30.29,-64.72 -71.63,-123.28 -121.57,-173.22 -56.31,-56.31 -123.57,-101.69 -198.28,-132.63 -71.93,-29.79 -150.82,-46.24 -233.57,-46.24 -82.75,0 -161.64,16.45 -233.57,46.24 -74.72,30.95 -141.97,76.32 -198.29,132.64 -49.94,49.94 -91.27,108.5 -121.57,173.22 -29.02,61.99 -47.94,129.67 -54.61,200.87l469.46,0 0,-179.41 71.74,0 0,179.41 124.6,0 0,-179.41 2.6,0z"/>
  1550. +  <path
  1551. +      android:fillColor="#FAEFC3"
  1552. +      android:pathData="M45.32,912.41c0.02,-97.3 19.39,-190.11 54.46,-274.78 36.44,-88 89.86,-167.18 156.14,-233.46 66.27,-66.27 145.46,-119.69 233.46,-156.14 84.72,-35.09 177.59,-54.46 274.95,-54.46 97.36,0 190.24,19.37 274.95,54.46 87.99,36.45 167.18,89.86 233.46,156.14 70.26,70.26 130.09,164.26 168.11,265.5 29.68,79.07 46.05,162.59 43.72,242.74l-1439.25,0zM893.84,68.75l0,786.07 478.53,0c-6.68,-71.21 -25.6,-138.89 -54.62,-200.88 -30.29,-64.72 -71.63,-123.28 -121.57,-173.22 -56.31,-56.31 -123.57,-101.69 -198.28,-132.63 -71.93,-29.79 -150.82,-46.24 -233.57,-46.24 -82.75,0 -161.64,16.45 -233.57,46.24 -74.72,30.95 -141.97,76.32 -198.29,132.64 -49.94,49.94 -91.27,108.5 -121.57,173.22 -29.02,61.99 -47.94,129.67 -54.61,200.87l469.46,0 0,-786.41 71.74,0 0,786.41 124.6,0 0,-786.07 71.75,0z"/>
  1553. +</vector>
  1554. diff --git a/evraz-wallet/app/src/main/res/drawable/oval_green_background.xml b/evraz-wallet/app/src/main/res/drawable/oval_green_background.xml
  1555. new file mode 100644
  1556. index 0000000..cd46bb3
  1557. --- /dev/null
  1558. +++ b/evraz-wallet/app/src/main/res/drawable/oval_green_background.xml
  1559. @@ -0,0 +1,9 @@
  1560. +<?xml version="1.0" encoding="UTF-8"?>
  1561. +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  1562. +    <item>
  1563. +        <shape xmlns:android="http://schemas.android.com/apk/res/android">
  1564. +            <corners android:radius="100dp" />
  1565. +            <solid android:color="@color/light_green_color" />
  1566. +        </shape>
  1567. +    </item>
  1568. +</selector>
  1569. \ No newline at end of file
  1570. diff --git a/evraz-wallet/app/src/main/res/drawable/oval_red_background.xml b/evraz-wallet/app/src/main/res/drawable/oval_red_background.xml
  1571. new file mode 100644
  1572. index 0000000..ad75d8d
  1573. --- /dev/null
  1574. +++ b/evraz-wallet/app/src/main/res/drawable/oval_red_background.xml
  1575. @@ -0,0 +1,9 @@
  1576. +<?xml version="1.0" encoding="UTF-8"?>
  1577. +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  1578. +    <item>
  1579. +        <shape xmlns:android="http://schemas.android.com/apk/res/android">
  1580. +            <corners android:radius="100dp" />
  1581. +            <solid android:color="@color/light_red_color" />
  1582. +        </shape>
  1583. +    </item>
  1584. +</selector>
  1585. \ No newline at end of file
  1586. diff --git a/evraz-wallet/app/src/main/res/drawable-hdpi/about_logo.png b/evraz-wallet/app/src/main/res/drawable-hdpi/about_logo.png
  1587. new file mode 100644
  1588. index 0000000..120ef2c
  1589. Binary files /dev/null and b/evraz-wallet/app/src/main/res/drawable-hdpi/about_logo.png differ
  1590. diff --git a/evraz-wallet/app/src/main/res/drawable-mdpi/about_logo.png b/evraz-wallet/app/src/main/res/drawable-mdpi/about_logo.png
  1591. new file mode 100644
  1592. index 0000000..177dd2a
  1593. Binary files /dev/null and b/evraz-wallet/app/src/main/res/drawable-mdpi/about_logo.png differ
  1594. diff --git a/evraz-wallet/app/src/main/res/drawable-xhdpi/about_logo.png b/evraz-wallet/app/src/main/res/drawable-xhdpi/about_logo.png
  1595. new file mode 100644
  1596. index 0000000..82780ca
  1597. Binary files /dev/null and b/evraz-wallet/app/src/main/res/drawable-xhdpi/about_logo.png differ
  1598. diff --git a/evraz-wallet/app/src/main/res/drawable-xxhdpi/about_logo.png b/evraz-wallet/app/src/main/res/drawable-xxhdpi/about_logo.png
  1599. new file mode 100644
  1600. index 0000000..8f6d11b
  1601. Binary files /dev/null and b/evraz-wallet/app/src/main/res/drawable-xxhdpi/about_logo.png differ
  1602. diff --git a/evraz-wallet/app/src/main/res/drawable-xxxhdpi/about_logo.png b/evraz-wallet/app/src/main/res/drawable-xxxhdpi/about_logo.png
  1603. new file mode 100644
  1604. index 0000000..88cf0f4
  1605. Binary files /dev/null and b/evraz-wallet/app/src/main/res/drawable-xxxhdpi/about_logo.png differ
  1606. diff --git a/evraz-wallet/app/src/main/res/drawable-xxxhdpi/button_white_line_normal.xml b/evraz-wallet/app/src/main/res/drawable-xxxhdpi/button_white_line_normal.xml
  1607. new file mode 100644
  1608. index 0000000..8ed4784
  1609. --- /dev/null
  1610. +++ b/evraz-wallet/app/src/main/res/drawable-xxxhdpi/button_white_line_normal.xml
  1611. @@ -0,0 +1,10 @@
  1612. +<?xml version="1.0" encoding="utf-8"?>
  1613. +<shape
  1614. +    xmlns:android="http://schemas.android.com/apk/res/android"
  1615. +    android:shape="rectangle">
  1616. +
  1617. +    <corners android:radius="5dp" />
  1618. +    <stroke
  1619. +        android:width="1dp"
  1620. +        android:color="@android:color/white" />
  1621. +</shape>
  1622. \ No newline at end of file
  1623. diff --git a/evraz-wallet/app/src/main/res/drawable-xxxhdpi/evraz.png b/evraz-wallet/app/src/main/res/drawable-xxxhdpi/evraz.png
  1624. new file mode 100644
  1625. index 0000000..aba04ac
  1626. Binary files /dev/null and b/evraz-wallet/app/src/main/res/drawable-xxxhdpi/evraz.png differ
  1627. diff --git a/evraz-wallet/app/src/main/res/drawable-xxxhdpi/fon.png b/evraz-wallet/app/src/main/res/drawable-xxxhdpi/fon.png
  1628. new file mode 100644
  1629. index 0000000..125cc93
  1630. Binary files /dev/null and b/evraz-wallet/app/src/main/res/drawable-xxxhdpi/fon.png differ
  1631. diff --git a/evraz-wallet/app/src/main/res/font/rosbank_sans_regular.ttf b/evraz-wallet/app/src/main/res/font/rosbank_sans_regular.ttf
  1632. new file mode 100644
  1633. index 0000000..df0c268
  1634. Binary files /dev/null and b/evraz-wallet/app/src/main/res/font/rosbank_sans_regular.ttf differ
  1635. diff --git a/bitshares_andriod_wallet/app/src/main/res/layout/activity_about.xml b/evraz-wallet/app/src/main/res/layout/activity_about.xml
  1636. index 67c330d..c33b9fc 100644
  1637. --- a/bitshares_andriod_wallet/app/src/main/res/layout/activity_about.xml
  1638. +++ b/evraz-wallet/app/src/main/res/layout/activity_about.xml
  1639. @@ -1,6 +1,5 @@
  1640.  <?xml version="1.0" encoding="utf-8"?>
  1641. -<android.support.design.widget.CoordinatorLayout
  1642. -    xmlns:android="http://schemas.android.com/apk/res/android"
  1643. +<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
  1644.      xmlns:app="http://schemas.android.com/apk/res-auto"
  1645.      xmlns:tools="http://schemas.android.com/tools"
  1646.      android:layout_width="match_parent"
  1647. @@ -10,8 +9,8 @@
  1648.      <android.support.design.widget.AppBarLayout
  1649.          android:layout_width="match_parent"
  1650.          android:layout_height="wrap_content"
  1651. -        android:elevation="0dp"
  1652.          android:background="@android:color/transparent"
  1653. +        android:elevation="0dp"
  1654.          android:theme="@style/AppTheme.AppBarOverlay">
  1655.  
  1656.          <android.support.v7.widget.Toolbar
  1657. @@ -22,34 +21,36 @@
  1658.              app:layout_collapseMode="pin"
  1659.              app:popupTheme="@style/AppTheme.PopupOverlay"
  1660.              app:title="@string/about_activity_title"
  1661. -            app:titleTextColor="@android:color/white"/>
  1662. +            app:titleTextColor="@android:color/white" />
  1663.  
  1664.          <LinearLayout
  1665.              android:layout_width="match_parent"
  1666.              android:layout_height="210dp"
  1667.              android:orientation="vertical">
  1668. +
  1669.              <ImageView
  1670. -                android:layout_marginTop="20dp"
  1671.                  android:layout_width="match_parent"
  1672.                  android:layout_height="wrap_content"
  1673. -                android:src="@mipmap/about_logo"
  1674. -                android:layout_gravity="center_horizontal"/>
  1675. +                android:layout_gravity="center_horizontal"
  1676. +                android:layout_marginTop="20dp"
  1677. +                android:src="@drawable/about_logo" />
  1678. +
  1679.              <TextView
  1680.                  android:layout_width="match_parent"
  1681.                  android:layout_height="wrap_content"
  1682.                  android:gravity="center_horizontal"
  1683.                  android:text="@string/app_name_full"
  1684.                  android:textColor="@android:color/white"
  1685. -                android:textStyle="italic"
  1686. -                android:textSize="30sp"/>
  1687. +                android:textSize="30sp"
  1688. +                android:textStyle="italic" />
  1689.  
  1690.              <TextView
  1691.                  android:id="@+id/textViewVersion"
  1692.                  android:layout_width="match_parent"
  1693.                  android:layout_height="wrap_content"
  1694. -                android:gravity="center_horizontal"
  1695.                  android:layout_marginTop="15dp"
  1696. -                android:text="Version 1.0.0"/>
  1697. +                android:gravity="center_horizontal"
  1698. +                android:text="Version 1.0.0" />
  1699.  
  1700.          </LinearLayout>
  1701.  
  1702. @@ -59,18 +60,20 @@
  1703.          android:id="@+id/fragment_container"
  1704.          android:layout_width="match_parent"
  1705.          android:layout_height="match_parent"
  1706. +        android:background="@color/gray_color"
  1707.          android:orientation="vertical"
  1708. -        android:background="@android:color/white"
  1709.          android:padding="8dp"
  1710.          app:layout_behavior="@string/appbar_scrolling_view_behavior">
  1711.  
  1712.          <TextView
  1713. -            android:layout_marginLeft="10dp"
  1714. -            android:layout_marginRight="10dp"
  1715.              android:layout_width="match_parent"
  1716.              android:layout_height="wrap_content"
  1717. +            android:layout_marginLeft="10dp"
  1718. +            android:layout_marginRight="10dp"
  1719.              android:layout_marginTop="30dp"
  1720. -            android:text="@string/about_activity_text"/>
  1721. +            android:text="@string/about_activity_text"
  1722. +            android:textColor="@color/table_gray_color"
  1723. +            tools:text="EVRAZ Wallet является мобильным приложением для Android и предназначен для использования на криптовалютной платформе Bitshares" />
  1724.  
  1725.          <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  1726.              xmlns:app="http://schemas.android.com/apk/res-auto"
  1727. @@ -82,12 +85,11 @@
  1728.                  android:id="@+id/webViewAvatar"
  1729.                  android:layout_width="70dp"
  1730.                  android:layout_height="70dp"
  1731. -                android:layout_marginTop="50dp"
  1732. -                android:layout_marginBottom="12dp"  />
  1733. +                android:layout_marginBottom="12dp"
  1734. +                android:layout_marginTop="50dp" />
  1735.  
  1736.              <TextView
  1737.                  android:id="@+id/textViewAccountName"
  1738. -                android:textColor="@android:color/black"
  1739.                  android:layout_width="wrap_content"
  1740.                  android:layout_height="wrap_content"
  1741.                  android:layout_alignTop="@+id/webViewAvatar"
  1742. @@ -95,35 +97,37 @@
  1743.                  android:layout_marginStart="19dp"
  1744.                  android:layout_toEndOf="@+id/webViewAvatar"
  1745.                  android:layout_toRightOf="@+id/webViewAvatar"
  1746. -                android:text="bituniverse2017" />
  1747. +                android:text="evraz"
  1748. +                android:textColor="@color/table_gray_color" />
  1749.  
  1750.              <TextView
  1751.                  android:id="@+id/textViewAccountId"
  1752. -                android:textColor="@color/black_overlay"
  1753.                  android:layout_width="wrap_content"
  1754.                  android:layout_height="wrap_content"
  1755.                  android:layout_alignLeft="@+id/textViewAccountName"
  1756. +
  1757.                  android:layout_alignStart="@+id/textViewAccountName"
  1758. -                android:layout_marginTop="2dp"
  1759. +                android:layout_below="@+id/textViewAccountName"
  1760.                  android:layout_marginBottom="4dp"
  1761. -                android:text="#399288"
  1762. -                android:layout_below="@+id/textViewAccountName" />
  1763. +                android:layout_marginTop="2dp"
  1764. +                android:text="#479866"
  1765. +                android:textColor="@color/table_gray_color" />
  1766.  
  1767.              <TextView
  1768.                  android:id="@+id/textViewCopyAccount"
  1769. -                android:paddingTop="3dp"
  1770. -                android:paddingLeft="6dp"
  1771. -                android:paddingRight="6dp"
  1772. -                android:paddingBottom="6dp"
  1773. -                android:background="@drawable/button_black_line_normal"
  1774.                  android:layout_width="wrap_content"
  1775.                  android:layout_height="wrap_content"
  1776.                  android:layout_alignLeft="@+id/textViewAccountId"
  1777.                  android:layout_alignStart="@+id/textViewAccountId"
  1778.                  android:layout_below="@+id/textViewAccountId"
  1779. -                android:textSize="10sp"
  1780. -                android:textColor="@color/black_overlay"
  1781. -                android:text="Copy Account" />
  1782. +                android:background="@drawable/button_white_line_normal"
  1783. +                android:paddingBottom="6dp"
  1784. +                android:paddingLeft="6dp"
  1785. +                android:textColor="@color/table_gray_color"
  1786. +                android:paddingRight="6dp"
  1787. +                android:paddingTop="3dp"
  1788. +                android:text="Copy Account"
  1789. +                android:textSize="10sp" />
  1790.  
  1791.          </RelativeLayout>
  1792.  
  1793. diff --git a/bitshares_andriod_wallet/app/src/main/res/layout/activity_model_select.xml b/evraz-wallet/app/src/main/res/layout/activity_model_select.xml
  1794. index 54407e3..bdb6420 100644
  1795. --- a/bitshares_andriod_wallet/app/src/main/res/layout/activity_model_select.xml
  1796. +++ b/evraz-wallet/app/src/main/res/layout/activity_model_select.xml
  1797. @@ -43,6 +43,7 @@
  1798.  
  1799.              <TextView
  1800.                  android:id="@+id/textViewWalletModelBin"
  1801. +                android:visibility="gone"
  1802.                  android:drawableLeft="@mipmap/wallet_model"
  1803.                  android:paddingLeft="15dp"
  1804.                  android:layout_width="250dp"
  1805. diff --git a/bitshares_andriod_wallet/app/src/main/res/layout/activity_settings.xml b/evraz-wallet/app/src/main/res/layout/activity_settings.xml
  1806. index 11a7558..eda7b1c 100644
  1807. --- a/bitshares_andriod_wallet/app/src/main/res/layout/activity_settings.xml
  1808. +++ b/evraz-wallet/app/src/main/res/layout/activity_settings.xml
  1809. @@ -32,7 +32,7 @@
  1810.          android:id="@+id/fragment_container"
  1811.          android:layout_width="match_parent"
  1812.          android:layout_height="match_parent"
  1813. -        android:background="@android:color/white"
  1814. +        android:background="@color/gray_color"
  1815.          android:padding="8dp"
  1816.          app:layout_behavior="@string/appbar_scrolling_view_behavior">
  1817.  
  1818. diff --git a/bitshares_andriod_wallet/app/src/main/res/layout/activity_sign_up_button.xml b/evraz-wallet/app/src/main/res/layout/activity_sign_up_button.xml
  1819. index 9e2f7fd..1e56b01 100644
  1820. --- a/bitshares_andriod_wallet/app/src/main/res/layout/activity_sign_up_button.xml
  1821. +++ b/evraz-wallet/app/src/main/res/layout/activity_sign_up_button.xml
  1822. @@ -25,7 +25,7 @@
  1823.              android:layout_height="wrap_content"
  1824.              android:layout_marginTop="70dp"
  1825.              android:layout_gravity="center_horizontal"
  1826. -            android:src="@mipmap/splash_logo"/>
  1827. +            android:src="@drawable/about_logo"/>
  1828.  
  1829.          <TextView
  1830.              android:id="@+id/buttonLogin"
  1831. diff --git a/bitshares_andriod_wallet/app/src/main/res/layout/fragment_wallet.xml b/evraz-wallet/app/src/main/res/layout/fragment_wallet.xml
  1832. index 7a5f83d..4aff491 100644
  1833. --- a/bitshares_andriod_wallet/app/src/main/res/layout/fragment_wallet.xml
  1834. +++ b/evraz-wallet/app/src/main/res/layout/fragment_wallet.xml
  1835. @@ -25,7 +25,7 @@
  1836.                  android:layout_gravity="bottom|center_horizontal"
  1837.                  android:gravity="center"
  1838.                  android:text="@string/main_activity_loading"
  1839. -                android:textColor="#FFCC00"
  1840. +                android:textColor="@color/colorAccentLight"
  1841.                  android:textSize="40sp" />
  1842.  
  1843.              <TextView
  1844. diff --git a/evraz-wallet/app/src/main/res/layout/new_activity_create_account.xml b/evraz-wallet/app/src/main/res/layout/new_activity_create_account.xml
  1845. new file mode 100644
  1846. index 0000000..a053d66
  1847. --- /dev/null
  1848. +++ b/evraz-wallet/app/src/main/res/layout/new_activity_create_account.xml
  1849. @@ -0,0 +1,194 @@
  1850. +<?xml version="1.0" encoding="utf-8"?>
  1851. +<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
  1852. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  1853. +    xmlns:tools="http://schemas.android.com/tools"
  1854. +    android:layout_width="match_parent"
  1855. +    android:layout_height="match_parent"
  1856. +    android:background="@android:color/black"
  1857. +    tools:context="com.bitshares.bitshareswallet.ImportActivty">
  1858. +
  1859. +    <android.support.design.widget.AppBarLayout
  1860. +        android:layout_width="match_parent"
  1861. +        android:layout_height="wrap_content"
  1862. +        android:background="@android:color/transparent"
  1863. +        android:elevation="0dp"
  1864. +        android:theme="@style/AppTheme.AppBarOverlay">
  1865. +
  1866. +        <android.support.v7.widget.Toolbar
  1867. +            android:id="@+id/toolbar"
  1868. +            android:layout_width="match_parent"
  1869. +            android:layout_height="?attr/actionBarSize"
  1870. +            android:elevation="0dp"
  1871. +            app:layout_collapseMode="pin"
  1872. +            app:popupTheme="@style/AppTheme.PopupOverlay"
  1873. +            app:title="@string/registration"
  1874. +            app:titleTextColor="@color/beige_color" />
  1875. +
  1876. +    </android.support.design.widget.AppBarLayout>
  1877. +
  1878. +    <FrameLayout
  1879. +        android:id="@+id/fragment_container"
  1880. +        android:layout_width="match_parent"
  1881. +        android:layout_height="match_parent"
  1882. +        android:padding="8dp"
  1883. +        app:layout_behavior="@string/appbar_scrolling_view_behavior">
  1884. +
  1885. +        <ScrollView
  1886. +            android:layout_width="match_parent"
  1887. +            android:layout_height="match_parent">
  1888. +
  1889. +            <LinearLayout
  1890. +                android:layout_width="match_parent"
  1891. +                android:layout_height="match_parent"
  1892. +                android:orientation="vertical">
  1893. +
  1894. +                <LinearLayout
  1895. +                    android:id="@+id/layoutAccountName"
  1896. +                    android:layout_width="match_parent"
  1897. +                    android:layout_height="wrap_content"
  1898. +                    android:orientation="vertical">
  1899. +
  1900. +                    <TextView
  1901. +                        style="@style/EvrazTextHeaderViewStyle"
  1902. +                        android:text="@string/account_name" />
  1903. +
  1904. +                    <RelativeLayout
  1905. +                        android:layout_width="match_parent"
  1906. +                        android:layout_height="match_parent">
  1907. +
  1908. +                        <EditText
  1909. +                            android:id="@+id/editTextAccountName"
  1910. +                            style="@style/EvrazEditTextStyle"
  1911. +                            android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-"
  1912. +                            android:gravity="center_vertical"
  1913. +                            android:inputType="text" />
  1914. +
  1915. +                        <ImageView
  1916. +                            android:id="@+id/imageViewAccountCheck"
  1917. +                            android:layout_width="wrap_content"
  1918. +                            android:layout_height="wrap_content"
  1919. +                            android:layout_alignBottom="@+id/editTextAccountName"
  1920. +                            android:layout_alignParentRight="true"
  1921. +                            android:layout_marginBottom="12dp"
  1922. +                            android:layout_marginRight="12dp"
  1923. +                            android:src="@mipmap/check"
  1924. +                            android:visibility="invisible" />
  1925. +
  1926. +                    </RelativeLayout>
  1927. +
  1928. +
  1929. +                    <TextView
  1930. +                        android:id="@+id/textViewErrorAccount"
  1931. +                        android:layout_width="match_parent"
  1932. +                        android:layout_height="wrap_content"
  1933. +                        android:layout_marginLeft="5dp"
  1934. +                        android:layout_marginRight="4dp"
  1935. +                        android:layout_marginTop="8dp"
  1936. +                        android:textColor="@color/red"
  1937. +                        android:textSize="14sp" />
  1938. +
  1939. +                </LinearLayout>
  1940. +
  1941. +                <TextView
  1942. +                    style="@style/EvrazTextHeaderViewStyle"
  1943. +                    android:text="@string/create_password" />
  1944. +
  1945. +
  1946. +                <EditText
  1947. +                    android:id="@+id/editTextPassword"
  1948. +                    style="@style/EvrazEditTextStyle"
  1949. +                    android:inputType="textPassword" />
  1950. +
  1951. +                <TextView
  1952. +                    android:id="@+id/textViewErrorPasswrod"
  1953. +                    android:layout_width="match_parent"
  1954. +                    android:layout_height="wrap_content"
  1955. +                    android:layout_marginLeft="5dp"
  1956. +                    android:layout_marginRight="4dp"
  1957. +                    android:layout_marginTop="8dp"
  1958. +                    android:textColor="@color/red"
  1959. +                    android:textSize="14sp" />
  1960. +
  1961. +                <TextView
  1962. +                    style="@style/EvrazTextHeaderViewStyle"
  1963. +                    android:text="@string/confirm_password" />
  1964. +
  1965. +                <RelativeLayout
  1966. +                    android:layout_width="match_parent"
  1967. +                    android:layout_height="wrap_content">
  1968. +
  1969. +                    <EditText
  1970. +                        android:id="@+id/editTextPasswordConfirm"
  1971. +                        style="@style/EvrazEditTextStyle"
  1972. +                        android:inputType="textPassword" />
  1973. +
  1974. +                    <ImageView
  1975. +                        android:id="@+id/imageViewPasswordConfirmCheck"
  1976. +                        android:layout_width="wrap_content"
  1977. +                        android:layout_height="wrap_content"
  1978. +                        android:layout_alignBottom="@+id/editTextPasswordConfirm"
  1979. +                        android:layout_alignParentRight="true"
  1980. +                        android:layout_marginBottom="12dp"
  1981. +                        android:layout_marginRight="12dp"
  1982. +                        android:src="@mipmap/check"
  1983. +                        android:visibility="invisible" />
  1984. +
  1985. +                </RelativeLayout>
  1986. +
  1987. +                <TextView
  1988. +                    android:id="@+id/textViewErrorInfo"
  1989. +                    android:layout_width="match_parent"
  1990. +                    android:layout_height="wrap_content"
  1991. +                    android:layout_marginLeft="5dp"
  1992. +                    android:layout_marginRight="4dp"
  1993. +                    android:layout_marginTop="8dp"
  1994. +                    android:textColor="@color/red"
  1995. +                    android:textSize="14sp" />
  1996. +
  1997. +                <android.support.v7.widget.AppCompatCheckBox
  1998. +                    android:id="@+id/checkBoxConfirm"
  1999. +                    android:layout_width="match_parent"
  2000. +                    android:layout_height="wrap_content"
  2001. +                    android:layout_marginBottom="8dp"
  2002. +                    android:gravity="top"
  2003. +                    android:text="@string/reg_checkbox_1"
  2004. +                    android:textColor="@color/beige_color"
  2005. +                    app:buttonTint="@color/beige_color" />
  2006. +
  2007. +                <android.support.v7.widget.AppCompatCheckBox
  2008. +                    android:id="@+id/checkBoxConfirm2"
  2009. +                    android:layout_width="match_parent"
  2010. +                    android:layout_height="wrap_content"
  2011. +                    android:layout_marginBottom="8dp"
  2012. +                    android:gravity="top"
  2013. +                    android:text="@string/reg_checkbox_2"
  2014. +                    android:textColor="@color/beige_color"
  2015. +                    app:buttonTint="@color/beige_color" />
  2016. +
  2017. +                <android.support.v7.widget.AppCompatCheckBox
  2018. +                    android:id="@+id/checkBoxConfirm3"
  2019. +                    android:layout_width="match_parent"
  2020. +                    android:layout_height="wrap_content"
  2021. +                    android:layout_marginBottom="8dp"
  2022. +                    android:gravity="top"
  2023. +                    android:text="@string/reg_checkbox_3"
  2024. +                    android:textColor="@color/beige_color"
  2025. +                    app:buttonTint="@color/beige_color" />
  2026. +
  2027. +                <TextView
  2028. +                    android:id="@+id/buttonCreate"
  2029. +                    style="@style/EvrazTextViewButton"
  2030. +                    android:layout_width="wrap_content"
  2031. +                    android:layout_gravity="center"
  2032. +                    android:layout_marginTop="12dp"
  2033. +                    android:paddingLeft="12dp"
  2034. +                    android:paddingRight="12dp"
  2035. +                    android:text="@string/create_account_activity_button" />
  2036. +
  2037. +
  2038. +            </LinearLayout>
  2039. +        </ScrollView>
  2040. +    </FrameLayout>
  2041. +
  2042. +
  2043. +</android.support.design.widget.CoordinatorLayout>
  2044. \ No newline at end of file
  2045. diff --git a/evraz-wallet/app/src/main/res/layout/new_activity_import_activty.xml b/evraz-wallet/app/src/main/res/layout/new_activity_import_activty.xml
  2046. new file mode 100644
  2047. index 0000000..cef3590
  2048. --- /dev/null
  2049. +++ b/evraz-wallet/app/src/main/res/layout/new_activity_import_activty.xml
  2050. @@ -0,0 +1,208 @@
  2051. +<?xml version="1.0" encoding="utf-8"?>
  2052. +<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
  2053. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  2054. +    xmlns:tools="http://schemas.android.com/tools"
  2055. +    android:layout_width="match_parent"
  2056. +    android:layout_height="match_parent"
  2057. +    android:background="@android:color/black"
  2058. +    tools:context="com.bitshares.bitshareswallet.ImportActivty">
  2059. +
  2060. +    <android.support.design.widget.AppBarLayout
  2061. +        android:layout_width="match_parent"
  2062. +        android:layout_height="wrap_content"
  2063. +        android:background="@android:color/transparent"
  2064. +        android:elevation="0dp"
  2065. +        android:theme="@style/AppTheme.AppBarOverlay">
  2066. +
  2067. +        <android.support.v7.widget.Toolbar
  2068. +            android:id="@+id/toolbar"
  2069. +            android:layout_width="match_parent"
  2070. +            android:layout_height="?attr/actionBarSize"
  2071. +            android:elevation="0dp"
  2072. +            app:layout_collapseMode="pin"
  2073. +            app:popupTheme="@style/AppTheme.PopupOverlay"
  2074. +            app:title="@string/import_activity_title"
  2075. +            app:titleTextColor="@color/beige_color" />
  2076. +
  2077. +    </android.support.design.widget.AppBarLayout>
  2078. +
  2079. +    <FrameLayout
  2080. +        android:id="@+id/fragment_container"
  2081. +        android:layout_width="match_parent"
  2082. +        android:layout_height="match_parent"
  2083. +
  2084. +        android:padding="16dp"
  2085. +        app:layout_behavior="@string/appbar_scrolling_view_behavior">
  2086. +
  2087. +        <LinearLayout
  2088. +            android:layout_width="match_parent"
  2089. +            android:layout_height="match_parent"
  2090. +            android:orientation="vertical">
  2091. +
  2092. +
  2093. +            <TextView
  2094. +                android:layout_width="wrap_content"
  2095. +                android:layout_height="wrap_content"
  2096. +                android:lineSpacingExtra="3sp"
  2097. +                android:text="@string/login_description"
  2098. +                android:textColor="#f6efcc"
  2099. +                android:textSize="14sp" />
  2100. +
  2101. +            <LinearLayout
  2102. +                android:id="@+id/layoutAccountName"
  2103. +                android:layout_width="match_parent"
  2104. +                android:layout_height="wrap_content"
  2105. +                android:layout_marginTop="70dp"
  2106. +                android:orientation="vertical">
  2107. +
  2108. +                <TextView
  2109. +                    style="@style/EvrazTextHeaderViewStyle"
  2110. +                    android:text="@string/account_name" />
  2111. +
  2112. +                <EditText
  2113. +                    android:id="@+id/editTextAccountName"
  2114. +                    style="@style/EvrazEditTextStyle"
  2115. +                    android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-"
  2116. +                    android:gravity="center_vertical"
  2117. +                    android:inputType="text" />
  2118. +
  2119. +            </LinearLayout>
  2120. +
  2121. +            <LinearLayout
  2122. +                android:id="@+id/layoutFileBin"
  2123. +                android:layout_width="match_parent"
  2124. +                android:layout_height="wrap_content"
  2125. +                android:orientation="vertical"
  2126. +                android:visibility="gone">
  2127. +
  2128. +                <TextView
  2129. +                    android:layout_width="match_parent"
  2130. +                    android:layout_height="wrap_content"
  2131. +                    android:layout_marginLeft="5dp"
  2132. +                    android:layout_marginRight="4dp"
  2133. +                    android:layout_marginTop="8dp"
  2134. +                    android:text="@string/label_file_path"
  2135. +                    android:textSize="14sp" />
  2136. +
  2137. +                <FrameLayout
  2138. +                    android:layout_width="match_parent"
  2139. +                    android:layout_height="wrap_content">
  2140. +
  2141. +                    <EditText
  2142. +                        android:id="@+id/editTextFilePath"
  2143. +                        android:layout_width="match_parent"
  2144. +                        android:layout_height="wrap_content"
  2145. +                        android:layout_marginTop="8dp"
  2146. +                        android:inputType="textMultiLine"
  2147. +                        android:lines="2"
  2148. +                        android:minLines="2" />
  2149. +
  2150. +                    <TextView
  2151. +                        android:id="@+id/buttonSelectFile"
  2152. +                        android:layout_width="80dp"
  2153. +                        android:layout_height="25dp"
  2154. +                        android:layout_gravity="right|bottom"
  2155. +                        android:layout_marginBottom="16dp"
  2156. +                        android:layout_marginRight="2dp"
  2157. +                        android:background="@drawable/button_small_background"
  2158. +                        android:gravity="center"
  2159. +                        android:text="@string/label_select_file"
  2160. +                        android:textColor="@android:color/white" />
  2161. +                </FrameLayout>
  2162. +
  2163. +
  2164. +            </LinearLayout>
  2165. +
  2166. +            <TextView
  2167. +                style="@style/EvrazTextHeaderViewStyle"
  2168. +                android:layout_marginTop="36dp"
  2169. +                android:text="@string/import_password" />
  2170. +
  2171. +
  2172. +            <EditText
  2173. +                android:id="@+id/editTextPassword"
  2174. +                style="@style/EvrazEditTextStyle"
  2175. +                android:inputType="textPassword" />
  2176. +
  2177. +            <LinearLayout
  2178. +                android:id="@+id/layoutPrivateKey"
  2179. +                android:layout_width="match_parent"
  2180. +                android:layout_height="wrap_content"
  2181. +                android:orientation="vertical"
  2182. +                android:visibility="gone">
  2183. +
  2184. +                <TextView
  2185. +                    android:layout_width="match_parent"
  2186. +                    android:layout_height="wrap_content"
  2187. +                    android:layout_marginLeft="5dp"
  2188. +                    android:layout_marginRight="4dp"
  2189. +                    android:layout_marginTop="8dp"
  2190. +                    android:text="@string/label_private_key"
  2191. +                    android:textSize="14sp" />
  2192. +
  2193. +                <EditText
  2194. +                    android:id="@+id/editTextPrivateKey"
  2195. +                    android:layout_width="match_parent"
  2196. +                    android:layout_height="wrap_content"
  2197. +                    android:layout_marginTop="8dp"
  2198. +                    android:inputType="textMultiLine"
  2199. +                    android:lines="2"
  2200. +                    android:minLines="2" />
  2201. +            </LinearLayout>
  2202. +
  2203. +            <LinearLayout
  2204. +                android:id="@+id/layoutBrainKey"
  2205. +                android:layout_width="match_parent"
  2206. +                android:layout_height="wrap_content"
  2207. +                android:orientation="vertical"
  2208. +                android:visibility="gone">
  2209. +
  2210. +                <TextView
  2211. +                    android:layout_width="match_parent"
  2212. +                    android:layout_height="wrap_content"
  2213. +                    android:layout_marginLeft="5dp"
  2214. +                    android:layout_marginRight="4dp"
  2215. +                    android:layout_marginTop="8dp"
  2216. +                    android:text="Brain Key:"
  2217. +                    android:textSize="14sp" />
  2218. +
  2219. +                <EditText
  2220. +                    android:id="@+id/editTextBrainKey"
  2221. +                    android:layout_width="match_parent"
  2222. +                    android:layout_height="wrap_content"
  2223. +                    android:layout_marginTop="8dp"
  2224. +                    android:inputType="textMultiLine"
  2225. +                    android:lines="2"
  2226. +                    android:minLines="2" />
  2227. +            </LinearLayout>
  2228. +
  2229. +
  2230. +            <TextView
  2231. +                android:id="@+id/textViewErrorInfo"
  2232. +                android:layout_width="match_parent"
  2233. +                android:layout_height="wrap_content"
  2234. +                android:layout_marginLeft="5dp"
  2235. +                android:layout_marginRight="4dp"
  2236. +                android:layout_marginTop="8dp"
  2237. +                android:textColor="@color/red"
  2238. +                android:textSize="14sp" />
  2239. +
  2240. +            <TextView
  2241. +                android:id="@+id/buttonImport"
  2242. +                style="@style/EvrazTextViewButton"
  2243. +                android:layout_width="wrap_content"
  2244. +                android:layout_gravity="center"
  2245. +                android:layout_marginTop="12dp"
  2246. +                android:background="@drawable/btn_green_background"
  2247. +                android:paddingEnd="22dp"
  2248. +                android:paddingStart="22dp"
  2249. +                android:text="@string/model_select_activity_title"
  2250. +                android:textColor="@android:color/black" />
  2251. +
  2252. +
  2253. +        </LinearLayout>
  2254. +
  2255. +    </FrameLayout>
  2256. +
  2257. +
  2258. +</android.support.design.widget.CoordinatorLayout>
  2259. \ No newline at end of file
  2260. diff --git a/evraz-wallet/app/src/main/res/layout/new_activity_main.xml b/evraz-wallet/app/src/main/res/layout/new_activity_main.xml
  2261. new file mode 100644
  2262. index 0000000..5d0fc82
  2263. --- /dev/null
  2264. +++ b/evraz-wallet/app/src/main/res/layout/new_activity_main.xml
  2265. @@ -0,0 +1,35 @@
  2266. +<?xml version="1.0" encoding="utf-8"?>
  2267. +<android.support.v4.widget.DrawerLayout
  2268. +    xmlns:android="http://schemas.android.com/apk/res/android"
  2269. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  2270. +    xmlns:tools="http://schemas.android.com/tools"
  2271. +    android:id="@+id/drawer"
  2272. +    android:layout_width="match_parent"
  2273. +    android:layout_height="match_parent"
  2274. +    android:fitsSystemWindows="true"
  2275. +    android:background="@color/background_color"
  2276. +    tools:openDrawer="start"
  2277. +    tools:context="com.ngse.ui.NewMainActivity">
  2278. +
  2279. +
  2280. +    <include
  2281. +        layout="@layout/new_app_bar_main"
  2282. +        android:layout_width="match_parent"
  2283. +        android:layout_height="match_parent" />
  2284. +
  2285. +
  2286. +    <android.support.design.widget.NavigationView
  2287. +        android:id="@+id/navigation_view"
  2288. +        android:layout_width="wrap_content"
  2289. +        android:layout_height="match_parent"
  2290. +        android:layout_gravity="start"
  2291. +        android:background="@color/gray_color"
  2292. +        android:fitsSystemWindows="true"
  2293. +        android:visibility="visible"
  2294. +        app:itemIconTint="@color/table_gray_color"
  2295. +        app:itemTextColor="@color/table_gray_color"
  2296. +        app:headerLayout="@layout/navigation_drawer_header"
  2297. +        app:menu="@menu/navigation_drawer_menu" />
  2298. +</android.support.v4.widget.DrawerLayout>
  2299. +
  2300. +
  2301. diff --git a/evraz-wallet/app/src/main/res/layout/new_activity_sign_up_button.xml b/evraz-wallet/app/src/main/res/layout/new_activity_sign_up_button.xml
  2302. new file mode 100644
  2303. index 0000000..b513e78
  2304. --- /dev/null
  2305. +++ b/evraz-wallet/app/src/main/res/layout/new_activity_sign_up_button.xml
  2306. @@ -0,0 +1,91 @@
  2307. +<?xml version="1.0" encoding="utf-8"?>
  2308. +<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
  2309. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  2310. +    xmlns:tools="http://schemas.android.com/tools"
  2311. +    android:layout_width="match_parent"
  2312. +    android:layout_height="match_parent"
  2313. +    android:background="@android:color/black"
  2314. +    android:fitsSystemWindows="true">
  2315. +    <ImageView
  2316. +        android:layout_width="wrap_content"
  2317. +        android:layout_height="wrap_content"
  2318. +        android:scaleType="centerCrop"
  2319. +        android:src="@drawable/fon"/>
  2320. +    <ImageView
  2321. +        android:id="@+id/logoImage"
  2322. +        android:layout_width="296dp"
  2323. +        android:layout_height="100dp"
  2324. +        android:layout_marginBottom="150dp"
  2325. +        android:scaleType="fitCenter"
  2326. +        app:layout_constraintBottom_toBottomOf="parent"
  2327. +        app:layout_constraintEnd_toEndOf="parent"
  2328. +        app:layout_constraintStart_toStartOf="parent"
  2329. +        app:layout_constraintTop_toTopOf="parent"
  2330. +        app:srcCompat="@drawable/ic_logo_evraz" />
  2331. +
  2332. +    <TextView
  2333. +        android:id="@+id/walletText"
  2334. +        android:layout_width="wrap_content"
  2335. +        android:layout_height="wrap_content"
  2336. +        android:layout_marginTop="8dp"
  2337. +        android:lineSpacingExtra="4sp"
  2338. +        android:text="@string/wallet"
  2339. +        android:textColor="@color/beige_color"
  2340. +        android:textSize="20sp"
  2341. +        app:layout_constraintEnd_toEndOf="@id/logoImage"
  2342. +        app:layout_constraintTop_toBottomOf="@id/logoImage" />
  2343. +
  2344. +    <TextView
  2345. +        android:id="@+id/text"
  2346. +        android:layout_width="wrap_content"
  2347. +        android:layout_height="wrap_content"
  2348. +        android:layout_marginTop="16dp"
  2349. +        android:text="@string/auth_title"
  2350. +        android:textColor="#a99d9d"
  2351. +        android:textSize="20sp"
  2352. +        app:layout_constraintEnd_toEndOf="parent"
  2353. +
  2354. +        app:layout_constraintStart_toStartOf="parent"
  2355. +        app:layout_constraintTop_toBottomOf="@id/walletText" />
  2356. +
  2357. +    <TextView
  2358. +        android:id="@+id/buttonLogin"
  2359. +        android:layout_width="270dp"
  2360. +        android:layout_height="wrap_content"
  2361. +        android:layout_marginBottom="20dp"
  2362. +        android:background="@drawable/btn_default_background"
  2363. +        android:lineSpacingExtra="6sp"
  2364. +        android:paddingBottom="8dp"
  2365. +        android:paddingEnd="32dp"
  2366. +        android:gravity="center"
  2367. +        android:paddingStart="32dp"
  2368. +        android:paddingTop="8dp"
  2369. +        android:text="@string/auth"
  2370. +        android:textColor="#ededed"
  2371. +        android:textSize="30sp"
  2372. +        app:layout_constraintBottom_toTopOf="@id/sign_up_button"
  2373. +        app:layout_constraintEnd_toEndOf="parent"
  2374. +        app:layout_constraintStart_toStartOf="parent"
  2375. +        app:layout_constraintTop_toBottomOf="@id/text"
  2376. +        app:layout_constraintVertical_chainStyle="packed" />
  2377. +
  2378. +    <TextView
  2379. +        android:id="@+id/sign_up_button"
  2380. +        android:layout_width="0dp"
  2381. +        android:layout_height="wrap_content"
  2382. +        android:background="@drawable/btn_default_background"
  2383. +        android:lineSpacingExtra="6sp"
  2384. +        android:paddingBottom="8dp"
  2385. +        android:paddingEnd="32dp"
  2386. +        android:paddingStart="32dp"
  2387. +        android:paddingTop="8dp"
  2388. +        android:gravity="center"
  2389. +        android:text="@string/registration"
  2390. +        android:textColor="#ededed"
  2391. +        android:textSize="30sp"
  2392. +        app:layout_constraintBottom_toBottomOf="parent"
  2393. +        app:layout_constraintEnd_toEndOf="@id/buttonLogin"
  2394. +        app:layout_constraintStart_toStartOf="@id/buttonLogin"
  2395. +        app:layout_constraintTop_toBottomOf="@id/buttonLogin" />
  2396. +
  2397. +</android.support.constraint.ConstraintLayout>
  2398. \ No newline at end of file
  2399. diff --git a/evraz-wallet/app/src/main/res/layout/new_activity_sign_up_info.xml b/evraz-wallet/app/src/main/res/layout/new_activity_sign_up_info.xml
  2400. new file mode 100644
  2401. index 0000000..065ef9c
  2402. --- /dev/null
  2403. +++ b/evraz-wallet/app/src/main/res/layout/new_activity_sign_up_info.xml
  2404. @@ -0,0 +1,75 @@
  2405. +<?xml version="1.0" encoding="utf-8"?>
  2406. +<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
  2407. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  2408. +    xmlns:tools="http://schemas.android.com/tools"
  2409. +    android:layout_width="match_parent"
  2410. +    android:layout_height="match_parent"
  2411. +    android:background="@android:color/black"
  2412. +    android:fitsSystemWindows="true">
  2413. +
  2414. +    <android.support.design.widget.AppBarLayout
  2415. +        android:id="@+id/appBarLayout"
  2416. +        android:layout_width="match_parent"
  2417. +        android:layout_height="wrap_content"
  2418. +        android:background="@android:color/transparent"
  2419. +        android:elevation="0dp"
  2420. +        android:theme="@style/AppTheme.AppBarOverlay"
  2421. +        app:layout_constraintTop_toTopOf="parent">
  2422. +
  2423. +        <android.support.v7.widget.Toolbar
  2424. +            android:id="@+id/toolbar"
  2425. +            android:layout_width="match_parent"
  2426. +            android:layout_height="?attr/actionBarSize"
  2427. +            android:elevation="0dp"
  2428. +            app:layout_collapseMode="pin"
  2429. +            app:popupTheme="@style/AppTheme.PopupOverlay"
  2430. +            app:titleTextColor="@color/beige_color" />
  2431. +
  2432. +    </android.support.design.widget.AppBarLayout>
  2433. +
  2434. +    <ScrollView
  2435. +        android:layout_width="0dp"
  2436. +        android:layout_height="0dp"
  2437. +        android:padding="16dp"
  2438. +        android:text="@string/app_description"
  2439. +        android:textColor="#dddbd5"
  2440. +        android:textSize="17sp"
  2441. +        app:layout_constraintBottom_toTopOf="@id/sign_up_next"
  2442. +        app:layout_constraintEnd_toEndOf="parent"
  2443. +        app:layout_constraintStart_toStartOf="parent"
  2444. +        app:layout_constraintTop_toBottomOf="@id/appBarLayout">
  2445. +
  2446. +        <LinearLayout
  2447. +            android:layout_width="match_parent"
  2448. +            android:layout_height="match_parent">
  2449. +
  2450. +            <TextView
  2451. +                android:layout_width="match_parent"
  2452. +                android:layout_height="match_parent"
  2453. +                android:text="@string/app_description"
  2454. +                android:textColor="#dddbd5"
  2455. +                android:textSize="17sp" />
  2456. +        </LinearLayout>
  2457. +    </ScrollView>
  2458. +
  2459. +
  2460. +    <TextView
  2461. +        android:id="@+id/sign_up_next"
  2462. +        style="@style/EvrazTextViewButton"
  2463. +        android:layout_width="wrap_content"
  2464. +        android:layout_height="wrap_content"
  2465. +        android:layout_marginBottom="16dp"
  2466. +        android:layout_marginRight="16dp"
  2467. +        android:paddingBottom="8dp"
  2468. +        android:paddingEnd="32dp"
  2469. +        android:paddingStart="32dp"
  2470. +        android:textSize="15sp"
  2471. +        android:paddingTop="8dp"
  2472. +        android:text="@string/continue_registration"
  2473. +        android:textAllCaps="true"
  2474. +        app:layout_constraintBottom_toBottomOf="parent"
  2475. +        app:layout_constraintEnd_toEndOf="parent"
  2476. +        app:layout_constraintHorizontal_bias="1"
  2477. +        app:layout_constraintStart_toStartOf="parent" />
  2478. +
  2479. +</android.support.constraint.ConstraintLayout>
  2480. \ No newline at end of file
  2481. diff --git a/evraz-wallet/app/src/main/res/layout/new_app_bar_main.xml b/evraz-wallet/app/src/main/res/layout/new_app_bar_main.xml
  2482. new file mode 100644
  2483. index 0000000..8619672
  2484. --- /dev/null
  2485. +++ b/evraz-wallet/app/src/main/res/layout/new_app_bar_main.xml
  2486. @@ -0,0 +1,62 @@
  2487. +<?xml version="1.0" encoding="utf-8"?>
  2488. +<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
  2489. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  2490. +    xmlns:tools="http://schemas.android.com/tools"
  2491. +    android:layout_width="match_parent"
  2492. +    android:layout_height="match_parent"
  2493. +    tools:context="com.ngse.ui.NewMainActivity">
  2494. +
  2495. +    <android.support.design.widget.AppBarLayout
  2496. +        android:layout_width="match_parent"
  2497. +        android:layout_height="wrap_content"
  2498. +        android:background="@android:color/transparent"
  2499. +        android:elevation="0dp"
  2500. +        android:theme="@style/AppTheme.AppBarOverlay">
  2501. +
  2502. +        <android.support.v7.widget.Toolbar
  2503. +            android:id="@+id/toolbar"
  2504. +            android:layout_width="match_parent"
  2505. +            android:layout_height="?attr/actionBarSize"
  2506. +            android:elevation="0dp"
  2507. +            app:layout_collapseMode="pin"
  2508. +            android:background="@android:color/black"
  2509. +            app:popupTheme="@style/AppTheme.PopupOverlay"
  2510. +            app:title="@string/app_name_full"
  2511. +            app:titleTextColor="@android:color/white">
  2512. +
  2513. +            <LinearLayout
  2514. +                android:id="@+id/lay_title"
  2515. +                android:layout_width="wrap_content"
  2516. +                android:layout_height="wrap_content"
  2517. +                android:layout_centerInParent="true"
  2518. +                android:layout_gravity="center">
  2519. +
  2520. +                <TextView
  2521. +                    android:id="@+id/txt_bar_title"
  2522. +                    android:layout_width="wrap_content"
  2523. +                    android:layout_height="wrap_content"
  2524. +                    android:text=""
  2525. +                    android:textColor="@android:color/white"
  2526. +                    android:textSize="20sp" />
  2527. +
  2528. +                <ImageView
  2529. +                    android:id="@+id/img_more"
  2530. +                    android:layout_width="wrap_content"
  2531. +                    android:layout_height="wrap_content"
  2532. +                    android:layout_gravity="center_vertical"
  2533. +                    app:srcCompat="@mipmap/ic_more" />
  2534. +            </LinearLayout>
  2535. +
  2536. +
  2537. +        </android.support.v7.widget.Toolbar>
  2538. +    </android.support.design.widget.AppBarLayout>
  2539. +
  2540. +    <FrameLayout
  2541. +        android:id="@+id/fragmentFrameLayout"
  2542. +        android:layout_width="match_parent"
  2543. +        android:layout_height="match_parent"
  2544. +        android:background="@android:color/white"
  2545. +        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
  2546. +
  2547. +
  2548. +</android.support.design.widget.CoordinatorLayout>
  2549. diff --git a/evraz-wallet/app/src/main/res/layout/new_custom_spinner_item.xml b/evraz-wallet/app/src/main/res/layout/new_custom_spinner_item.xml
  2550. new file mode 100644
  2551. index 0000000..6f48163
  2552. --- /dev/null
  2553. +++ b/evraz-wallet/app/src/main/res/layout/new_custom_spinner_item.xml
  2554. @@ -0,0 +1,8 @@
  2555. +<?xml version="1.0" encoding="utf-8"?>
  2556. +<TextView xmlns:android="http://schemas.android.com/apk/res/android"
  2557. +    xmlns:tools="http://schemas.android.com/tools"
  2558. +    android:layout_width="wrap_content"
  2559. +    android:layout_height="wrap_content"
  2560. +    android:textColor="@color/beige_color"
  2561. +    android:textSize="@dimen/send_fragment_text_size"
  2562. +    tools:text="#22222" />
  2563. \ No newline at end of file
  2564. diff --git a/evraz-wallet/app/src/main/res/layout/new_fragment_balance.xml b/evraz-wallet/app/src/main/res/layout/new_fragment_balance.xml
  2565. new file mode 100644
  2566. index 0000000..9d85147
  2567. --- /dev/null
  2568. +++ b/evraz-wallet/app/src/main/res/layout/new_fragment_balance.xml
  2569. @@ -0,0 +1,80 @@
  2570. +<?xml version="1.0" encoding="utf-8"?>
  2571. +<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
  2572. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  2573. +    xmlns:tools="http://schemas.android.com/tools"
  2574. +    android:layout_width="match_parent"
  2575. +    android:layout_height="match_parent">
  2576. +
  2577. +    <LinearLayout
  2578. +        android:id="@+id/balanceContainer"
  2579. +        android:layout_width="0dp"
  2580. +        android:layout_height="wrap_content"
  2581. +
  2582. +        android:gravity="center"
  2583. +        android:orientation="vertical"
  2584. +        app:layout_constraintBottom_toTopOf="@id/buttonsContainer"
  2585. +        app:layout_constraintEnd_toEndOf="parent"
  2586. +        app:layout_constraintStart_toStartOf="parent"
  2587. +        app:layout_constraintTop_toTopOf="parent"
  2588. +        app:layout_constraintVertical_chainStyle="spread">
  2589. +
  2590. +        <TextView
  2591. +            style="@style/EvrazTitle"
  2592. +            android:text="@string/balance" />
  2593. +
  2594. +        <TextView
  2595. +            android:id="@+id/textTotalBalance"
  2596. +            style="@style/EvrazTitle"
  2597. +            android:layout_marginTop="8dp"
  2598. +            android:text="@string/main_activity_loading" />
  2599. +
  2600. +        <TextView
  2601. +            android:id="@+id/textViewCurrency"
  2602. +            android:layout_width="wrap_content"
  2603. +            android:layout_height="wrap_content"
  2604. +            android:layout_marginTop="8dp"
  2605. +            android:textColor="#f6efcc"
  2606. +            android:textSize="15sp"
  2607. +            tools:text="(123456,000 USD)" />
  2608. +    </LinearLayout>
  2609. +
  2610. +    <LinearLayout
  2611. +        android:id="@+id/buttonsContainer"
  2612. +        android:layout_width="0dp"
  2613. +        android:layout_height="wrap_content"
  2614. +        android:layout_marginEnd="40dp"
  2615. +        android:layout_marginStart="40dp"
  2616. +        android:gravity="center"
  2617. +        android:orientation="vertical"
  2618. +        app:layout_constraintBottom_toBottomOf="parent"
  2619. +        app:layout_constraintEnd_toEndOf="parent"
  2620. +        app:layout_constraintStart_toStartOf="parent"
  2621. +        app:layout_constraintTop_toBottomOf="@id/balanceContainer">
  2622. +
  2623. +        <TextView
  2624. +            android:id="@+id/portfolio"
  2625. +            style="@style/EvrazTextViewButton"
  2626. +            android:layout_marginBottom="16dp"
  2627. +            android:text="@string/portfolio" />
  2628. +
  2629. +        <TextView
  2630. +            android:id="@+id/openOrders"
  2631. +            style="@style/EvrazTextViewButton"
  2632. +            android:layout_marginBottom="16dp"
  2633. +            android:visibility="gone"
  2634. +            android:text="@string/open_orders" />
  2635. +
  2636. +        <TextView
  2637. +            android:id="@+id/positionProvision"
  2638. +            style="@style/EvrazTextViewButton"
  2639. +            android:layout_marginBottom="16dp"
  2640. +            android:text="@string/position_provision"
  2641. +            android:visibility="gone" />
  2642. +
  2643. +        <TextView
  2644. +            android:id="@+id/transactions"
  2645. +            style="@style/EvrazTextViewButton"
  2646. +            android:text="@string/transactions" />
  2647. +
  2648. +    </LinearLayout>
  2649. +</android.support.constraint.ConstraintLayout>
  2650. \ No newline at end of file
  2651. diff --git a/evraz-wallet/app/src/main/res/layout/new_fragment_buy_sell.xml b/evraz-wallet/app/src/main/res/layout/new_fragment_buy_sell.xml
  2652. new file mode 100644
  2653. index 0000000..76d6ffa
  2654. --- /dev/null
  2655. +++ b/evraz-wallet/app/src/main/res/layout/new_fragment_buy_sell.xml
  2656. @@ -0,0 +1,295 @@
  2657. +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
  2658. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  2659. +    xmlns:tools="http://schemas.android.com/tools"
  2660. +    android:layout_width="match_parent"
  2661. +    android:layout_height="match_parent"
  2662. +    android:background="@color/dark_gray_color"
  2663. +    android:orientation="vertical">
  2664. +
  2665. +    <LinearLayout
  2666. +        android:layout_width="match_parent"
  2667. +        android:layout_height="match_parent"
  2668. +        android:background="@color/dark_gray_color"
  2669. +        android:orientation="vertical">
  2670. +
  2671. +        <View
  2672. +            android:layout_width="match_parent"
  2673. +            android:layout_height="1dp"
  2674. +            android:background="@color/beige_color" />
  2675. +
  2676. +        <LinearLayout
  2677. +            android:layout_width="match_parent"
  2678. +            android:layout_height="wrap_content"
  2679. +            android:orientation="horizontal">
  2680. +
  2681. +            <TextView
  2682. +                android:id="@+id/pTextFirstView"
  2683. +                style="@style/EvrazTextSellBuyTableStyle"
  2684. +                android:text="@string/label_price" />
  2685. +
  2686. +            <View
  2687. +                android:layout_width="1dp"
  2688. +                android:layout_height="match_parent"
  2689. +                android:background="@color/beige_color" />
  2690. +
  2691. +            <EditText
  2692. +                android:id="@+id/pEditText"
  2693. +                style="@style/EvrazTextSellBuyTableStyle"
  2694. +                android:background="@null"
  2695. +                android:ems="8"
  2696. +                android:gravity="end"
  2697. +                android:inputType="numberDecimal"
  2698. +                android:maxLines="1" />
  2699. +
  2700. +            <View
  2701. +                android:layout_width="1dp"
  2702. +                android:layout_height="match_parent"
  2703. +                android:background="@color/beige_color" />
  2704. +
  2705. +            <TextView
  2706. +                android:id="@+id/pTextLastView"
  2707. +                style="@style/EvrazTextSellBuyTableStyle"
  2708. +                tools:text="@string/label_bts_cny" />
  2709. +        </LinearLayout>
  2710. +
  2711. +        <View
  2712. +            android:layout_width="match_parent"
  2713. +            android:layout_height="1dp"
  2714. +            android:background="@color/beige_color" />
  2715. +
  2716. +        <LinearLayout
  2717. +            android:layout_width="match_parent"
  2718. +            android:layout_height="wrap_content"
  2719. +            android:orientation="horizontal">
  2720. +
  2721. +            <TextView
  2722. +                android:id="@+id/qTextFirstView"
  2723. +                style="@style/EvrazTextSellBuyTableStyle"
  2724. +                android:text="@string/label_quantity" />
  2725. +
  2726. +            <View
  2727. +                android:layout_width="1dp"
  2728. +                android:layout_height="match_parent"
  2729. +                android:background="@color/beige_color" />
  2730. +
  2731. +            <EditText
  2732. +                android:id="@+id/qEditText"
  2733. +                style="@style/EvrazTextSellBuyTableStyle"
  2734. +                android:background="@null"
  2735. +                android:ems="8"
  2736. +                android:gravity="end"
  2737. +                android:inputType="numberDecimal"
  2738. +                android:maxLines="1" />
  2739. +
  2740. +            <View
  2741. +                android:layout_width="1dp"
  2742. +                android:layout_height="match_parent"
  2743. +                android:background="@color/beige_color" />
  2744. +
  2745. +            <TextView
  2746. +                android:id="@+id/qTextLastView"
  2747. +                style="@style/EvrazTextSellBuyTableStyle"
  2748. +                tools:text="@string/label_bts" />
  2749. +        </LinearLayout>
  2750. +
  2751. +        <View
  2752. +            android:layout_width="match_parent"
  2753. +            android:layout_height="1dp"
  2754. +            android:background="@color/beige_color" />
  2755. +
  2756. +        <LinearLayout
  2757. +            android:layout_width="match_parent"
  2758. +            android:layout_height="wrap_content"
  2759. +            android:orientation="horizontal">
  2760. +
  2761. +            <TextView
  2762. +                android:id="@+id/tTextFirstView"
  2763. +                style="@style/EvrazTextSellBuyTableStyle"
  2764. +                android:text="@string/label_total" />
  2765. +
  2766. +            <View
  2767. +                android:layout_width="1dp"
  2768. +                android:layout_height="match_parent"
  2769. +                android:background="@color/beige_color" />
  2770. +
  2771. +            <EditText
  2772. +                android:id="@+id/tEditText"
  2773. +                style="@style/EvrazTextSellBuyTableStyle"
  2774. +                android:background="@null"
  2775. +                android:ems="8"
  2776. +                android:gravity="end"
  2777. +                android:enabled="false"
  2778. +                android:inputType="numberDecimal"
  2779. +                android:maxLines="1" />
  2780. +
  2781. +            <View
  2782. +                android:layout_width="1dp"
  2783. +                android:layout_height="match_parent"
  2784. +                android:background="@color/beige_color" />
  2785. +
  2786. +            <TextView
  2787. +                android:id="@+id/tTextLastView"
  2788. +                style="@style/EvrazTextSellBuyTableStyle"
  2789. +                tools:text="@string/label_cny" />
  2790. +        </LinearLayout>
  2791. +
  2792. +        <View
  2793. +            android:layout_width="match_parent"
  2794. +            android:layout_height="1dp"
  2795. +            android:background="@color/beige_color" />
  2796. +
  2797. +
  2798. +        <LinearLayout
  2799. +            android:layout_width="match_parent"
  2800. +            android:layout_height="wrap_content"
  2801. +            android:orientation="horizontal">
  2802. +
  2803. +            <TextView
  2804. +                android:id="@+id/fTextFirstView"
  2805. +                style="@style/EvrazTextSellBuyTableStyle"
  2806. +                android:text="@string/label_fee" />
  2807. +
  2808. +            <View
  2809. +                android:layout_width="1dp"
  2810. +                android:layout_height="match_parent"
  2811. +                android:background="@color/beige_color" />
  2812. +
  2813. +            <EditText
  2814. +                android:id="@+id/fEditText"
  2815. +                style="@style/EvrazTextSellBuyTableStyle"
  2816. +                android:background="@null"
  2817. +                android:ems="8"
  2818. +                android:gravity="end"
  2819. +                android:enabled="false"
  2820. +                android:inputType="numberDecimal"
  2821. +                android:maxLines="1" />
  2822. +
  2823. +            <View
  2824. +                android:layout_width="1dp"
  2825. +                android:layout_height="match_parent"
  2826. +                android:background="@color/beige_color" />
  2827. +
  2828. +            <TextView
  2829. +                android:id="@+id/fTextLastView"
  2830. +                style="@style/EvrazTextSellBuyTableStyle"
  2831. +                android:text="@string/label_bts" />
  2832. +        </LinearLayout>
  2833. +
  2834. +
  2835. +        <View
  2836. +            android:layout_width="match_parent"
  2837. +            android:layout_height="1dp"
  2838. +            android:background="@color/beige_color" />
  2839. +
  2840. +        <LinearLayout
  2841. +            android:layout_width="match_parent"
  2842. +            android:layout_height="wrap_content"
  2843. +            android:layout_marginTop="4dp"
  2844. +            android:orientation="horizontal">
  2845. +
  2846. +            <TextView
  2847. +                android:id="@+id/textView"
  2848. +                android:layout_width="wrap_content"
  2849. +                android:layout_height="wrap_content"
  2850. +                android:layout_marginLeft="16dp"
  2851. +                android:text="@string/label_balance"
  2852. +                android:textColor="@color/beige_color" />
  2853. +
  2854. +            <TextView
  2855. +                android:id="@+id/balanceText"
  2856. +                android:layout_width="wrap_content"
  2857. +                android:layout_height="wrap_content"
  2858. +                android:layout_marginLeft="4dp"
  2859. +                android:layout_marginStart="4dp"
  2860. +                android:textColor="@color/beige_color" />
  2861. +
  2862. +            <TextView
  2863. +                android:id="@+id/balanceTextBase"
  2864. +                android:layout_width="wrap_content"
  2865. +                android:layout_height="wrap_content"
  2866. +                android:layout_marginLeft="4dp"
  2867. +                android:layout_marginStart="4dp"
  2868. +                android:textColor="@color/beige_color" />
  2869. +
  2870. +        </LinearLayout>
  2871. +
  2872. +        <LinearLayout
  2873. +            android:layout_width="match_parent"
  2874. +            android:layout_height="wrap_content"
  2875. +            android:layout_marginTop="4dp"
  2876. +            android:orientation="horizontal">
  2877. +
  2878. +
  2879. +            <TextView
  2880. +                android:id="@+id/askTextInfo"
  2881. +                android:layout_width="wrap_content"
  2882. +                android:layout_height="wrap_content"
  2883. +                android:layout_marginLeft="16dp"
  2884. +                android:layout_marginRight="4dp"
  2885. +                android:text="@string/label_lowest_ask"
  2886. +                android:textColor="@color/beige_color" />
  2887. +
  2888. +            <TextView
  2889. +                android:id="@+id/askText"
  2890. +                android:layout_width="wrap_content"
  2891. +                android:layout_height="wrap_content"
  2892. +                android:layout_marginEnd="4dp"
  2893. +                android:layout_marginRight="4dp"
  2894. +                android:textColor="@color/beige_color" />
  2895. +
  2896. +            <TextView
  2897. +                android:id="@+id/askTextBase"
  2898. +                android:layout_width="wrap_content"
  2899. +                android:layout_height="wrap_content"
  2900. +                android:layout_marginEnd="25dp"
  2901. +                android:layout_marginRight="25dp"
  2902. +                android:textColor="@color/beige_color" />
  2903. +
  2904. +
  2905. +        </LinearLayout>
  2906. +
  2907. +
  2908. +        <LinearLayout
  2909. +            android:id="@+id/linearLayout4"
  2910. +            android:layout_width="match_parent"
  2911. +            android:layout_height="wrap_content"
  2912. +            android:layout_marginTop="8dp"
  2913. +            app:layout_constraintTop_toBottomOf="@+id/textView">
  2914. +
  2915. +
  2916. +            <Button
  2917. +                android:id="@+id/okButton"
  2918. +                style="@style/EvrazTextViewButton"
  2919. +                android:layout_width="0dp"
  2920. +                android:layout_height="wrap_content"
  2921. +                android:layout_marginLeft="18dp"
  2922. +                android:layout_marginRight="6dp"
  2923. +                android:layout_weight="1"
  2924. +                android:background="@drawable/btn_green_background"
  2925. +                android:padding="4dp"
  2926. +                android:text="@string/label_buy"
  2927. +                android:textColor="@android:color/black"
  2928. +                app:layout_constraintLeft_toRightOf="@+id/restButton"
  2929. +                app:layout_constraintRight_toRightOf="parent"
  2930. +                app:layout_constraintTop_toBottomOf="@+id/askTextInfo" />
  2931. +
  2932. +            <Button
  2933. +                android:id="@+id/restButton"
  2934. +                style="@style/EvrazTextViewButton"
  2935. +                android:layout_width="0dp"
  2936. +                android:layout_height="wrap_content"
  2937. +                android:layout_marginLeft="6dp"
  2938. +                android:layout_marginRight="18dp"
  2939. +                android:layout_weight="1"
  2940. +                android:background="@drawable/btn_red_background"
  2941. +                android:padding="4dp"
  2942. +                android:text="@string/label_reset"
  2943. +                android:textColor="@android:color/black"
  2944. +                app:layout_constraintLeft_toLeftOf="parent"
  2945. +                app:layout_constraintTop_toBottomOf="@+id/textView" />
  2946. +
  2947. +        </LinearLayout>
  2948. +
  2949. +
  2950. +    </LinearLayout>
  2951. +</ScrollView>
  2952. diff --git a/evraz-wallet/app/src/main/res/layout/new_fragment_buy_sell_orders.xml b/evraz-wallet/app/src/main/res/layout/new_fragment_buy_sell_orders.xml
  2953. new file mode 100644
  2954. index 0000000..889d6e1
  2955. --- /dev/null
  2956. +++ b/evraz-wallet/app/src/main/res/layout/new_fragment_buy_sell_orders.xml
  2957. @@ -0,0 +1,191 @@
  2958. +<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
  2959. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  2960. +    xmlns:tools="http://schemas.android.com/tools"
  2961. +    android:layout_width="match_parent"
  2962. +    android:layout_height="match_parent"
  2963. +    android:background="@color/dark_gray_color">
  2964. +
  2965. +
  2966. +    <LinearLayout
  2967. +        android:id="@+id/linearLayout2"
  2968. +        android:layout_width="0dp"
  2969. +        android:layout_height="0dp"
  2970. +        android:layout_marginTop="6dp"
  2971. +        android:orientation="vertical"
  2972. +        app:layout_constraintBottom_toBottomOf="parent"
  2973. +        app:layout_constraintLeft_toLeftOf="parent"
  2974. +        app:layout_constraintRight_toLeftOf="@+id/guideline"
  2975. +        app:layout_constraintTop_toTopOf="parent">
  2976. +
  2977. +        <TextView
  2978. +            android:id="@+id/textView7"
  2979. +            android:layout_width="wrap_content"
  2980. +            android:layout_height="wrap_content"
  2981. +            android:layout_gravity="center"
  2982. +            android:text="@string/orders_to_buy"
  2983. +            android:textAllCaps="true"
  2984. +            android:layout_marginBottom="6dp"
  2985. +            android:textColor="@color/beige_color"
  2986. +            android:textSize="15sp"
  2987. +            app:layout_constraintLeft_toLeftOf="parent"
  2988. +            app:layout_constraintTop_toBottomOf="@+id/imageView2" />
  2989. +
  2990. +        <View
  2991. +            android:layout_width="match_parent"
  2992. +            android:layout_height="1dp"
  2993. +            android:background="@color/beige_color" />
  2994. +
  2995. +        <LinearLayout
  2996. +            android:layout_width="match_parent"
  2997. +            android:layout_height="wrap_content"
  2998. +            android:orientation="horizontal">
  2999. +
  3000. +            <TextView
  3001. +                style="@style/EvrazTextHeaderTableStyle"
  3002. +                android:layout_weight="1"
  3003. +                android:text="@string/price" />
  3004. +
  3005. +            <View
  3006. +                android:layout_width="1dp"
  3007. +                android:layout_height="match_parent"
  3008. +                android:background="@color/beige_color" />
  3009. +
  3010. +            <TextView
  3011. +                style="@style/EvrazTextHeaderTableStyle"
  3012. +                android:layout_weight="1"
  3013. +                android:text="@string/short_count" />
  3014. +
  3015. +            <!--   <TextView
  3016. +                   android:layout_width="wrap_content"
  3017. +                   android:layout_height="wrap_content"
  3018. +                   android:layout_marginLeft="30dp"
  3019. +                   android:layout_marginStart="30dp"
  3020. +                   android:text="@string/text_price"
  3021. +                   android:textColor="@android:color/black" />
  3022. +
  3023. +               <View
  3024. +                   android:layout_width="0dp"
  3025. +                   android:layout_height="0dp"
  3026. +                   android:layout_weight="1" />
  3027. +
  3028. +               <TextView
  3029. +                   android:layout_width="wrap_content"
  3030. +                   android:layout_height="wrap_content"
  3031. +                   android:layout_marginEnd="30dp"
  3032. +                   android:layout_marginRight="30dp"
  3033. +                   android:text="@string/trade_fragment_quantity"
  3034. +                   android:textColor="@android:color/black" />-->
  3035. +        </LinearLayout>
  3036. +
  3037. +        <View
  3038. +            android:layout_width="match_parent"
  3039. +            android:layout_height="1dp"
  3040. +            android:background="@color/beige_color" />
  3041. +
  3042. +        <android.support.v7.widget.RecyclerView
  3043. +            android:id="@+id/buy_recycler"
  3044. +            android:layout_width="match_parent"
  3045. +            android:layout_height="match_parent"
  3046. +            app:layout_constraintBottom_toBottomOf="parent"
  3047. +            app:layout_constraintLeft_toLeftOf="parent"
  3048. +            app:layout_constraintTop_toBottomOf="@+id/textView7" />
  3049. +    </LinearLayout>
  3050. +
  3051. +    <LinearLayout
  3052. +        android:id="@+id/linearLayout3"
  3053. +        android:layout_width="0dp"
  3054. +        android:layout_height="0dp"
  3055. +        android:layout_marginTop="6dp"
  3056. +        android:orientation="vertical"
  3057. +        app:layout_constraintBottom_toBottomOf="parent"
  3058. +        app:layout_constraintLeft_toLeftOf="@+id/guideline"
  3059. +        app:layout_constraintRight_toRightOf="parent"
  3060. +        app:layout_constraintTop_toTopOf="parent">
  3061. +
  3062. +        <TextView
  3063. +            android:id="@+id/textView8"
  3064. +            android:layout_width="wrap_content"
  3065. +            android:layout_height="wrap_content"
  3066. +            android:layout_gravity="center"
  3067. +            android:text="@string/orders_to_sell"
  3068. +            android:textAllCaps="true"
  3069. +            android:textColor="@color/beige_color"
  3070. +            android:textSize="15sp"
  3071. +            android:layout_marginBottom="6dp"
  3072. +            app:layout_constraintLeft_toLeftOf="parent"
  3073. +            app:layout_constraintTop_toBottomOf="@+id/imageView2" />
  3074. +
  3075. +        <View
  3076. +            android:layout_width="match_parent"
  3077. +            android:layout_height="1dp"
  3078. +            android:background="@color/beige_color" />
  3079. +
  3080. +        <LinearLayout
  3081. +            android:layout_width="match_parent"
  3082. +            android:layout_height="wrap_content">
  3083. +
  3084. +            <TextView
  3085. +                style="@style/EvrazTextHeaderTableStyle"
  3086. +                android:layout_weight="1"
  3087. +                android:text="@string/price" />
  3088. +
  3089. +            <View
  3090. +                android:layout_width="1dp"
  3091. +                android:layout_height="match_parent"
  3092. +                android:background="@color/beige_color" />
  3093. +
  3094. +            <TextView
  3095. +                style="@style/EvrazTextHeaderTableStyle"
  3096. +                android:layout_weight="1"
  3097. +                android:text="@string/short_count" />
  3098. +
  3099. +            <!-- <TextView
  3100. +                 android:layout_width="wrap_content"
  3101. +                 android:layout_height="wrap_content"
  3102. +                 android:layout_marginLeft="30dp"
  3103. +                 android:layout_marginStart="30dp"
  3104. +                 android:text="@string/text_price"
  3105. +                 android:textColor="@android:color/black" />
  3106. +
  3107. +             <View
  3108. +                 android:layout_width="0dp"
  3109. +                 android:layout_height="0dp"
  3110. +                 android:layout_weight="1" />
  3111. +
  3112. +             <TextView
  3113. +                 android:layout_width="wrap_content"
  3114. +                 android:layout_height="wrap_content"
  3115. +                 android:layout_marginEnd="30dp"
  3116. +                 android:layout_marginRight="30dp"
  3117. +                 android:text="@string/trade_fragment_quantity"
  3118. +                 android:textColor="@android:color/black" />-->
  3119. +        </LinearLayout>
  3120. +
  3121. +        <View
  3122. +            android:layout_width="match_parent"
  3123. +            android:layout_height="1dp"
  3124. +            android:background="@color/beige_color" />
  3125. +
  3126. +        <android.support.v7.widget.RecyclerView
  3127. +            android:id="@+id/sell_recycler"
  3128. +            android:layout_width="match_parent"
  3129. +            android:layout_height="match_parent"
  3130. +            app:layout_constraintBottom_toBottomOf="parent"
  3131. +            app:layout_constraintRight_toRightOf="parent"
  3132. +            app:layout_constraintTop_toBottomOf="@+id/textView8" />
  3133. +    </LinearLayout>
  3134. +
  3135. +    <android.support.constraint.Guideline
  3136. +        android:id="@+id/guideline"
  3137. +        android:layout_width="wrap_content"
  3138. +        android:layout_height="wrap_content"
  3139. +        android:orientation="vertical"
  3140. +        app:layout_constraintGuide_percent="0.5" />
  3141. +
  3142. +    <View
  3143. +        android:layout_width="1dp"
  3144. +        android:layout_height="0dp"
  3145. +        android:background="@color/beige_color"
  3146. +        app:layout_constraintEnd_toEndOf="parent"
  3147. +        app:layout_constraintStart_toStartOf="parent" />
  3148. +</android.support.constraint.ConstraintLayout>
  3149. diff --git a/evraz-wallet/app/src/main/res/layout/new_fragment_exchange.xml b/evraz-wallet/app/src/main/res/layout/new_fragment_exchange.xml
  3150. new file mode 100644
  3151. index 0000000..dcb1bda
  3152. --- /dev/null
  3153. +++ b/evraz-wallet/app/src/main/res/layout/new_fragment_exchange.xml
  3154. @@ -0,0 +1,33 @@
  3155. +<?xml version="1.0" encoding="utf-8"?>
  3156. +<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3157. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  3158. +    android:layout_width="match_parent"
  3159. +    android:layout_height="match_parent"
  3160. +    android:background="@android:color/black">
  3161. +
  3162. +    <TextView
  3163. +        android:id="@+id/titleExchange"
  3164. +        style="@style/EvrazTitle"
  3165. +        android:paddingBottom="24dp"
  3166. +        android:paddingTop="24dp"
  3167. +        android:text="@string/exchange_title"
  3168. +        app:layout_constraintEnd_toEndOf="parent"
  3169. +        app:layout_constraintStart_toStartOf="parent" />
  3170. +
  3171. +    <View
  3172. +        android:layout_width="match_parent"
  3173. +        android:layout_height="1dp"
  3174. +        android:background="@color/grey"
  3175. +        app:layout_constraintTop_toBottomOf="@id/titleExchange" />
  3176. +
  3177. +    <android.support.v7.widget.RecyclerView
  3178. +        android:id="@+id/recyclerView"
  3179. +        android:layout_width="0dp"
  3180. +        android:layout_height="0dp"
  3181. +        android:layout_marginTop="1dp"
  3182. +        android:background="@color/dark_gray_color"
  3183. +        app:layout_constraintBottom_toBottomOf="parent"
  3184. +        app:layout_constraintEnd_toEndOf="parent"
  3185. +        app:layout_constraintStart_toStartOf="parent"
  3186. +        app:layout_constraintTop_toBottomOf="@id/titleExchange" />
  3187. +</android.support.constraint.ConstraintLayout>
  3188. \ No newline at end of file
  3189. diff --git a/evraz-wallet/app/src/main/res/layout/new_fragment_orders.xml b/evraz-wallet/app/src/main/res/layout/new_fragment_orders.xml
  3190. new file mode 100644
  3191. index 0000000..be1fbfa
  3192. --- /dev/null
  3193. +++ b/evraz-wallet/app/src/main/res/layout/new_fragment_orders.xml
  3194. @@ -0,0 +1,149 @@
  3195. +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3196. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  3197. +    xmlns:tools="http://schemas.android.com/tools"
  3198. +    android:layout_width="match_parent"
  3199. +    android:layout_height="match_parent"
  3200. +    android:background="@color/dark_gray_color"
  3201. +    android:orientation="vertical">
  3202. +
  3203. +    <TextView
  3204. +        style="@style/EvrazTitle"
  3205. +        android:layout_width="match_parent"
  3206. +        android:background="@android:color/black"
  3207. +        android:paddingBottom="24dp"
  3208. +        android:paddingTop="24dp"
  3209. +        android:text="@string/open_orders"
  3210. +        android:visibility="gone" />
  3211. +
  3212. +    <TextView
  3213. +        android:id="@+id/textUSDBalance"
  3214. +        android:layout_width="match_parent"
  3215. +        android:layout_height="wrap_content"
  3216. +        android:background="@android:color/black"
  3217. +        android:gravity="right"
  3218. +        android:paddingBottom="8dp"
  3219. +        android:paddingRight="16dp"
  3220. +        android:paddingTop="8dp"
  3221. +        android:textColor="#f6efcc"
  3222. +        android:textSize="14sp"
  3223. +        android:visibility="gone"
  3224. +        tools:text="Всего: 100 USD" />
  3225. +
  3226. +    <View
  3227. +        android:layout_width="match_parent"
  3228. +        android:layout_height="1dp"
  3229. +        android:background="@color/beige_color" />
  3230. +
  3231. +    <LinearLayout
  3232. +        android:layout_width="match_parent"
  3233. +        android:layout_height="wrap_content"
  3234. +        android:orientation="horizontal">
  3235. +
  3236. +        <TextView
  3237. +            style="@style/EvrazTextHeaderTableStyle"
  3238. +            android:layout_weight="90"
  3239. +            android:text="@string/description" />
  3240. +
  3241. +        <View
  3242. +            android:layout_width="1dp"
  3243. +            android:layout_height="match_parent"
  3244. +            android:background="@color/beige_color" />
  3245. +
  3246. +        <TextView
  3247. +            style="@style/EvrazTextHeaderTableStyle"
  3248. +            android:layout_weight="35"
  3249. +            android:text="@string/price" />
  3250. +
  3251. +        <View
  3252. +            android:layout_width="1dp"
  3253. +            android:layout_height="match_parent"
  3254. +            android:background="@color/beige_color" />
  3255. +
  3256. +        <!--<TextView
  3257. +            style="@style/EvrazTextHeaderTableStyle"
  3258. +            android:layout_weight="60"
  3259. +            android:text="@string/usd_cost" />
  3260. +
  3261. +        <View
  3262. +            android:layout_width="1dp"
  3263. +            android:layout_height="match_parent"
  3264. +            android:background="@color/beige_color" />-->
  3265. +
  3266. +        <TextView
  3267. +            style="@style/EvrazTextHeaderTableStyle"
  3268. +            android:layout_weight="40"
  3269. +            android:text="@string/cancel" />
  3270. +
  3271. +    </LinearLayout>
  3272. +
  3273. +    <View
  3274. +        android:layout_width="match_parent"
  3275. +        android:layout_height="1dp"
  3276. +        android:background="@color/beige_color" />
  3277. +
  3278. +    <FrameLayout
  3279. +        android:layout_width="match_parent"
  3280. +        android:layout_height="match_parent">
  3281. +
  3282. +        <LinearLayout
  3283. +            android:layout_width="match_parent"
  3284. +            android:layout_height="match_parent"
  3285. +            android:orientation="horizontal">
  3286. +
  3287. +            <TextView
  3288. +                style="@style/EvrazTextHeaderTableStyle"
  3289. +                android:layout_weight="90"
  3290. +                android:visibility="invisible" />
  3291. +
  3292. +            <View
  3293. +                android:layout_width="1dp"
  3294. +                android:layout_height="match_parent"
  3295. +                android:background="@color/beige_color" />
  3296. +
  3297. +            <TextView
  3298. +                style="@style/EvrazTextHeaderTableStyle"
  3299. +                android:layout_weight="35"
  3300. +                android:visibility="invisible" />
  3301. +
  3302. +            <View
  3303. +                android:layout_width="1dp"
  3304. +                android:layout_height="match_parent"
  3305. +                android:background="@color/beige_color" />
  3306. +
  3307. +            <!--  <TextView
  3308. +                  style="@style/EvrazTextHeaderTableStyle"
  3309. +                  android:layout_weight="60"
  3310. +                  android:visibility="invisible" />
  3311. +              <View
  3312. +                  android:layout_width="1dp"
  3313. +                  android:layout_height="match_parent"
  3314. +                  android:background="@color/beige_color" />-->
  3315. +
  3316. +            <TextView
  3317. +                style="@style/EvrazTextHeaderTableStyle"
  3318. +                android:layout_weight="40"
  3319. +                android:visibility="invisible" />
  3320. +
  3321. +
  3322. +        </LinearLayout>
  3323. +
  3324. +
  3325. +        <android.support.v7.widget.RecyclerView
  3326. +            android:id="@+id/fo_list"
  3327. +            android:layout_width="match_parent"
  3328. +            android:layout_height="match_parent"
  3329. +            app:layoutManager="android.support.v7.widget.LinearLayoutManager"
  3330. +            tools:listitem="@layout/new_view_my_order_item">
  3331. +
  3332. +        </android.support.v7.widget.RecyclerView>
  3333. +
  3334. +        <TextView
  3335. +            android:id="@+id/fo_txt_none"
  3336. +            android:layout_width="wrap_content"
  3337. +            android:layout_height="wrap_content"
  3338. +            android:layout_gravity="center"
  3339. +            android:text="@string/label_no_open_orders"
  3340. +            android:textColor="@color/label_gray"
  3341. +            android:visibility="gone" />
  3342. +    </FrameLayout>
  3343. +</LinearLayout>
  3344. diff --git a/evraz-wallet/app/src/main/res/layout/new_fragment_portfolio.xml b/evraz-wallet/app/src/main/res/layout/new_fragment_portfolio.xml
  3345. new file mode 100644
  3346. index 0000000..e7c0f44
  3347. --- /dev/null
  3348. +++ b/evraz-wallet/app/src/main/res/layout/new_fragment_portfolio.xml
  3349. @@ -0,0 +1,136 @@
  3350. +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3351. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  3352. +    xmlns:tools="http://schemas.android.com/tools"
  3353. +    android:layout_width="match_parent"
  3354. +    android:layout_height="match_parent"
  3355. +    android:background="@color/dark_gray_color"
  3356. +    android:gravity="center_horizontal"
  3357. +    android:orientation="vertical"
  3358. +    >
  3359. +
  3360. +    <TextView
  3361. +        style="@style/EvrazTitle"
  3362. +        android:layout_width="match_parent"
  3363. +        android:background="@android:color/black"
  3364. +        android:paddingBottom="24dp"
  3365. +        android:paddingTop="24dp"
  3366. +        android:text="@string/portfolio"
  3367. +        app:layout_constraintEnd_toEndOf="parent"
  3368. +        app:layout_constraintStart_toStartOf="parent" />
  3369. +
  3370. +    <TextView
  3371. +        android:id="@+id/textUSDBalance"
  3372. +        android:layout_width="match_parent"
  3373. +        android:layout_height="wrap_content"
  3374. +        android:background="@android:color/black"
  3375. +        android:gravity="right"
  3376. +        android:textColor="#f6efcc"
  3377. +        android:paddingRight="16dp"
  3378. +        android:paddingTop="8dp"
  3379. +        android:paddingBottom="8dp"
  3380. +        android:textSize="14sp"
  3381. +        tools:text="Всего: 100 USD" />
  3382. +
  3383. +    <View
  3384. +        android:layout_width="match_parent"
  3385. +        android:layout_height="1dp"
  3386. +        android:background="@color/beige_color" />
  3387. +
  3388. +    <LinearLayout
  3389. +        android:layout_width="match_parent"
  3390. +        android:layout_height="wrap_content"
  3391. +        android:orientation="horizontal">
  3392. +
  3393. +        <TextView
  3394. +            style="@style/EvrazTextHeaderTableStyle"
  3395. +
  3396. +            android:text="@string/assets" />
  3397. +
  3398. +        <View
  3399. +            android:layout_width="1dp"
  3400. +            android:layout_height="match_parent"
  3401. +            android:background="@color/beige_color" />
  3402. +
  3403. +        <TextView
  3404. +            style="@style/EvrazTextHeaderTableStyle"
  3405. +            android:text="@string/short_count" />
  3406. +        <View
  3407. +            android:layout_width="1dp"
  3408. +            android:layout_height="match_parent"
  3409. +            android:background="@color/beige_color" />
  3410. +
  3411. +        <TextView
  3412. +            android:id="@+id/usdRateTitle"
  3413. +            style="@style/EvrazTextHeaderTableStyle"
  3414. +
  3415. +            android:text="@string/usd_rate" />
  3416. +        <View
  3417. +            android:layout_width="1dp"
  3418. +            android:layout_height="match_parent"
  3419. +            android:background="@color/beige_color" />
  3420. +
  3421. +        <TextView
  3422. +            android:id="@+id/usdCostTitle"
  3423. +            style="@style/EvrazTextHeaderTableStyle"
  3424. +
  3425. +            android:text="@string/usd_cost" />
  3426. +
  3427. +    </LinearLayout>
  3428. +
  3429. +    <View
  3430. +        android:layout_width="match_parent"
  3431. +        android:layout_height="1dp"
  3432. +        android:background="@color/beige_color" />
  3433. +
  3434. +    <FrameLayout
  3435. +        android:layout_width="match_parent"
  3436. +        android:layout_height="match_parent">
  3437. +
  3438. +        <LinearLayout
  3439. +            android:layout_width="match_parent"
  3440. +            android:layout_height="match_parent"
  3441. +            android:orientation="horizontal">
  3442. +
  3443. +            <TextView
  3444. +                style="@style/EvrazTextHeaderTableStyle"
  3445. +                android:visibility="invisible" />
  3446. +
  3447. +            <View
  3448. +                android:layout_width="1dp"
  3449. +                android:layout_height="match_parent"
  3450. +                android:background="@color/beige_color" />
  3451. +
  3452. +            <TextView
  3453. +                style="@style/EvrazTextHeaderTableStyle"
  3454. +                android:visibility="invisible" />
  3455. +            <View
  3456. +                android:layout_width="1dp"
  3457. +                android:layout_height="match_parent"
  3458. +                android:background="@color/beige_color" />
  3459. +
  3460. +            <TextView
  3461. +                style="@style/EvrazTextHeaderTableStyle"
  3462. +                android:visibility="invisible" />
  3463. +            <View
  3464. +                android:layout_width="1dp"
  3465. +                android:layout_height="match_parent"
  3466. +                android:background="@color/beige_color" />
  3467. +
  3468. +            <TextView
  3469. +                style="@style/EvrazTextHeaderTableStyle"
  3470. +                android:visibility="invisible" />
  3471. +
  3472. +
  3473. +        </LinearLayout>
  3474. +
  3475. +        <android.support.v7.widget.RecyclerView
  3476. +            android:id="@+id/recyclerView"
  3477. +            android:layout_width="match_parent"
  3478. +            app:layoutManager="android.support.v7.widget.LinearLayoutManager"
  3479. +            tools:listitem="@layout/new_recyclerview_item_balances"
  3480. +            android:layout_height="match_parent" />
  3481. +
  3482. +
  3483. +    </FrameLayout>
  3484. +
  3485. +</LinearLayout>
  3486. diff --git a/evraz-wallet/app/src/main/res/layout/new_fragment_send.xml b/evraz-wallet/app/src/main/res/layout/new_fragment_send.xml
  3487. new file mode 100644
  3488. index 0000000..a5c40ce
  3489. --- /dev/null
  3490. +++ b/evraz-wallet/app/src/main/res/layout/new_fragment_send.xml
  3491. @@ -0,0 +1,248 @@
  3492. +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3493. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  3494. +    xmlns:tools="http://schemas.android.com/tools"
  3495. +    android:layout_width="match_parent"
  3496. +    android:layout_height="match_parent"
  3497. +    android:background="@android:color/black"
  3498. +    tools:context="com.bitshares.bitshareswallet.SendFragment">
  3499. +
  3500. +    <RelativeLayout
  3501. +        android:layout_width="match_parent"
  3502. +        android:layout_height="match_parent"
  3503. +        android:layout_marginLeft="30dp"
  3504. +        android:layout_marginRight="30dp"
  3505. +        android:layout_marginTop="20dp"
  3506. +        android:orientation="vertical">
  3507. +
  3508. +        <android.support.v4.widget.NestedScrollView
  3509. +            android:layout_width="match_parent"
  3510. +            android:layout_height="wrap_content"
  3511. +            android:layout_above="@+id/btn_send"
  3512. +            android:layout_alignParentLeft="true"
  3513. +            android:layout_alignParentStart="true"
  3514. +            android:layout_alignParentTop="true">
  3515. +
  3516. +            <LinearLayout
  3517. +                android:layout_width="match_parent"
  3518. +                android:layout_height="wrap_content"
  3519. +                android:gravity="center_horizontal"
  3520. +                android:orientation="vertical">
  3521. +
  3522. +                <TextView
  3523. +                    style="@style/EvrazTitle"
  3524. +                    android:text="@string/send" />
  3525. +
  3526. +                <TextView
  3527. +                    style="@style/EvrazTextHeaderViewStyle"
  3528. +                    android:layout_marginBottom="8dp"
  3529. +                    android:text="@string/from" />
  3530. +
  3531. +                <RelativeLayout
  3532. +                    android:layout_width="match_parent"
  3533. +                    android:layout_height="45dp">
  3534. +
  3535. +                    <WebView
  3536. +                        android:id="@+id/webViewAvatarFrom"
  3537. +                        android:layout_width="44dp"
  3538. +                        android:layout_height="44dp" />
  3539. +
  3540. +                    <EditText
  3541. +                        android:id="@+id/editTextFrom"
  3542. +                        android:layout_width="match_parent"
  3543. +                        android:layout_height="44dp"
  3544. +                        android:layout_marginLeft="12dp"
  3545. +                        android:layout_toRightOf="@id/webViewAvatarFrom"
  3546. +                        android:background="@drawable/btn_default_background"
  3547. +                        android:focusable="false"
  3548. +                        android:focusableInTouchMode="false"
  3549. +                        android:inputType="text"
  3550. +                        android:paddingBottom="10dp"
  3551. +                        android:paddingLeft="10dp"
  3552. +                        android:paddingRight="80dp"
  3553. +                        android:paddingTop="10dp"
  3554. +                        android:textColor="@color/beige_color"
  3555. +                        android:textSize="@dimen/send_fragment_text_size"
  3556. +                        android:textStyle="bold"
  3557. +                        tools:text="test124" />
  3558. +
  3559. +                    <TextView
  3560. +                        android:id="@+id/textViewFromId"
  3561. +                        android:layout_width="80dp"
  3562. +                        android:layout_height="wrap_content"
  3563. +                        android:layout_alignBottom="@+id/editTextFrom"
  3564. +                        android:layout_alignParentRight="true"
  3565. +                        android:layout_marginBottom="12dp"
  3566. +                        android:layout_marginRight="8dp"
  3567. +                        android:text="#22222"
  3568. +                        android:textColor="@color/beige_color"
  3569. +                        android:textSize="@dimen/send_fragment_text_size" />
  3570. +
  3571. +                </RelativeLayout>
  3572. +
  3573. +
  3574. +                <TextView
  3575. +                    style="@style/EvrazTextHeaderViewStyle"
  3576. +                    android:layout_marginBottom="8dp"
  3577. +                    android:layout_marginTop="8dp"
  3578. +                    android:text="@string/to" />
  3579. +
  3580. +                <RelativeLayout
  3581. +                    android:layout_width="match_parent"
  3582. +                    android:layout_height="45dp">
  3583. +
  3584. +                    <WebView
  3585. +                        android:id="@+id/webViewAvatarTo"
  3586. +                        android:layout_width="44dp"
  3587. +                        android:layout_height="44dp" />
  3588. +
  3589. +                    <EditText
  3590. +                        android:id="@+id/editTextTo"
  3591. +                        android:layout_width="match_parent"
  3592. +                        android:layout_height="44dp"
  3593. +                        android:layout_marginLeft="12dp"
  3594. +                        android:layout_toRightOf="@+id/webViewAvatarTo"
  3595. +                        android:background="@drawable/btn_default_background"
  3596. +                        android:inputType="text"
  3597. +                        android:paddingBottom="10dp"
  3598. +                        android:paddingLeft="10dp"
  3599. +                        android:paddingRight="80dp"
  3600. +                        android:paddingTop="10dp"
  3601. +                        android:textColor="@color/beige_color"
  3602. +                        android:textSize="@dimen/send_fragment_text_size"
  3603. +                        android:textStyle="bold" />
  3604. +
  3605. +                    <TextView
  3606. +                        android:id="@+id/textViewToId"
  3607. +                        android:layout_width="80dp"
  3608. +                        android:layout_height="wrap_content"
  3609. +                        android:layout_alignBottom="@+id/editTextTo"
  3610. +                        android:layout_alignParentRight="true"
  3611. +                        android:layout_marginBottom="12dp"
  3612. +                        android:layout_marginRight="8dp"
  3613. +                        android:text="#"
  3614. +                        android:textColor="@color/beige_color"
  3615. +                        android:textSize="@dimen/send_fragment_text_size" />
  3616. +
  3617. +                </RelativeLayout>
  3618. +
  3619. +                <TextView
  3620. +                    style="@style/EvrazTextHeaderViewStyle"
  3621. +                    android:layout_marginBottom="8dp"
  3622. +                    android:layout_marginTop="8dp"
  3623. +                    android:text="@string/count" />
  3624. +
  3625. +                <LinearLayout
  3626. +                    android:layout_width="match_parent"
  3627. +                    android:layout_height="wrap_content"
  3628. +                    android:background="@drawable/btn_default_background"
  3629. +                    android:orientation="horizontal">
  3630. +
  3631. +
  3632. +                    <EditText
  3633. +                        android:id="@+id/editTextQuantity"
  3634. +                        android:layout_width="0dp"
  3635. +                        android:layout_height="44dp"
  3636. +                        android:layout_marginLeft="4dp"
  3637. +                        android:layout_marginRight="8dp"
  3638. +                        android:layout_weight="1"
  3639. +                        android:background="@null"
  3640. +                        android:inputType="numberDecimal"
  3641. +                        android:paddingBottom="10dp"
  3642. +                        android:paddingLeft="10dp"
  3643. +                        android:paddingTop="10dp"
  3644. +                        android:text="1"
  3645. +                        android:textColor="@color/beige_color"
  3646. +                        android:textSize="@dimen/send_fragment_text_size" />
  3647. +
  3648. +                    <android.support.v7.widget.AppCompatSpinner
  3649. +                        android:id="@+id/spinner_unit"
  3650. +                        android:layout_width="65dp"
  3651. +                        android:layout_height="wrap_content"
  3652. +                        android:layout_marginRight="16dp"
  3653. +                        android:entries="@array/bts_unit"
  3654. +                        android:textColor="@color/beige_color"
  3655. +                        android:textSize="@dimen/send_fragment_text_size"
  3656. +                        app:backgroundTint="@color/beige_color" />
  3657. +                </LinearLayout>
  3658. +
  3659. +                <TextView
  3660. +                    style="@style/EvrazTextHeaderViewStyle"
  3661. +                    android:layout_marginBottom="8dp"
  3662. +                    android:layout_marginTop="8dp"
  3663. +                    android:text="@string/note" />
  3664. +
  3665. +                <EditText
  3666. +                    android:id="@+id/editTextMemo"
  3667. +                    android:layout_width="match_parent"
  3668. +                    android:layout_height="44dp"
  3669. +                    android:background="@drawable/btn_default_background"
  3670. +                    android:inputType="text"
  3671. +                    android:paddingBottom="10dp"
  3672. +                    android:paddingLeft="10dp"
  3673. +                    android:paddingTop="10dp"
  3674. +                    android:textColor="@color/beige_color"
  3675. +                    android:textSize="@dimen/send_fragment_text_size" />
  3676. +
  3677. +                <TextView
  3678. +                    style="@style/EvrazTextHeaderViewStyle"
  3679. +                    android:layout_marginBottom="8dp"
  3680. +                    android:layout_marginTop="8dp"
  3681. +                    android:text="@string/comission" />
  3682. +
  3683. +
  3684. +                <LinearLayout
  3685. +                    android:layout_width="match_parent"
  3686. +                    android:layout_height="wrap_content"
  3687. +                    android:layout_marginBottom="16dp"
  3688. +                    android:background="@drawable/btn_default_background"
  3689. +                    android:gravity="center_vertical"
  3690. +                    android:orientation="horizontal">
  3691. +
  3692. +
  3693. +                    <EditText
  3694. +                        android:id="@+id/editTextFee"
  3695. +                        android:layout_width="0dp"
  3696. +                        android:layout_height="wrap_content"
  3697. +                        android:minHeight="44dp"
  3698. +                        android:layout_marginLeft="4dp"
  3699. +                        android:layout_marginRight="8dp"
  3700. +                        android:layout_weight="1"
  3701. +                        android:background="@null"
  3702. +                        android:focusable="false"
  3703. +                        android:focusableInTouchMode="false"
  3704. +                        android:paddingBottom="10dp"
  3705. +                        android:paddingLeft="10dp"
  3706. +                        android:paddingTop="10dp"
  3707. +                        android:text=""
  3708. +                        android:textColor="@color/beige_color"
  3709. +                        android:textSize="@dimen/send_fragment_text_size" />
  3710. +
  3711. +                    <android.support.v7.widget.AppCompatSpinner
  3712. +                        android:id="@+id/spinner_fee_unit"
  3713. +                        android:layout_width="65dp"
  3714. +                        android:layout_height="wrap_content"
  3715. +                        android:layout_marginRight="16dp"
  3716. +
  3717. +                        android:textSize="@dimen/send_fragment_text_size"
  3718. +                        app:backgroundTint="@color/beige_color" />
  3719. +                </LinearLayout>
  3720. +
  3721. +
  3722. +            </LinearLayout>
  3723. +
  3724. +        </android.support.v4.widget.NestedScrollView>
  3725. +
  3726. +        <TextView
  3727. +            android:id="@+id/btn_send"
  3728. +            style="@style/EvrazTextViewButton"
  3729. +            android:layout_alignParentBottom="true"
  3730. +            android:layout_centerHorizontal="true"
  3731. +            android:layout_marginBottom="8dp"
  3732. +            android:background="@drawable/btn_green_background"
  3733. +            android:text="@string/send"
  3734. +            android:textColor="@android:color/black" />
  3735. +
  3736. +    </RelativeLayout>
  3737. +
  3738. +
  3739. +</FrameLayout>
  3740. diff --git a/evraz-wallet/app/src/main/res/layout/new_fragment_trading_schedule.xml b/evraz-wallet/app/src/main/res/layout/new_fragment_trading_schedule.xml
  3741. new file mode 100644
  3742. index 0000000..ff5f465
  3743. --- /dev/null
  3744. +++ b/evraz-wallet/app/src/main/res/layout/new_fragment_trading_schedule.xml
  3745. @@ -0,0 +1,212 @@
  3746. +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3747. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  3748. +    xmlns:tools="http://schemas.android.com/tools"
  3749. +    android:layout_width="match_parent"
  3750. +    android:layout_height="match_parent"
  3751. +    android:background="@color/dark_gray_color"
  3752. +    android:gravity="center_horizontal"
  3753. +    android:orientation="vertical">
  3754. +
  3755. +    <TextView
  3756. +        style="@style/EvrazTitle"
  3757. +        android:layout_width="match_parent"
  3758. +        android:background="@android:color/black"
  3759. +        android:paddingBottom="6dp"
  3760. +        android:paddingTop="6dp"
  3761. +        android:text="@string/trading_schedule"
  3762. +        app:layout_constraintEnd_toEndOf="parent"
  3763. +        app:layout_constraintStart_toStartOf="parent" />
  3764. +
  3765. +    <RelativeLayout
  3766. +        android:layout_width="match_parent"
  3767. +        android:layout_height="150dp"
  3768. +        android:background="@color/background_color"
  3769. +        android:orientation="vertical"
  3770. +        android:paddingLeft="2dp"
  3771. +        android:paddingRight="4dp">
  3772. +
  3773. +        <LinearLayout
  3774. +            android:id="@+id/layoutSelected"
  3775. +            android:layout_width="match_parent"
  3776. +            android:layout_height="wrap_content"
  3777. +            android:layout_marginLeft="12dp"
  3778. +            android:gravity="center_horizontal"
  3779. +            android:orientation="horizontal"
  3780. +            android:visibility="invisible">
  3781. +
  3782. +            <TextView
  3783. +                android:id="@+id/textViewDate"
  3784. +                android:layout_width="wrap_content"
  3785. +                android:layout_height="wrap_content"
  3786. +                android:text="09/22 16:00"
  3787. +                android:textColor="@android:color/white"
  3788. +                android:textSize="12sp"
  3789. +                android:textStyle="bold" />
  3790. +
  3791. +            <TextView
  3792. +                android:layout_width="wrap_content"
  3793. +                android:layout_height="wrap_content"
  3794. +                android:layout_marginLeft="8dp"
  3795. +                android:text="@string/label_high"
  3796. +                android:textColor="@android:color/white"
  3797. +                android:textSize="12sp" />
  3798. +
  3799. +            <TextView
  3800. +                android:id="@+id/textViewHigh"
  3801. +                android:layout_width="wrap_content"
  3802. +                android:layout_height="wrap_content"
  3803. +                android:layout_marginLeft="2dp"
  3804. +                android:text="13636.931"
  3805. +                android:textColor="@android:color/white"
  3806. +                android:textSize="12sp"
  3807. +                android:textStyle="bold" />
  3808. +
  3809. +            <TextView
  3810. +                android:layout_width="wrap_content"
  3811. +                android:layout_height="wrap_content"
  3812. +                android:layout_marginLeft="4dp"
  3813. +                android:text="@string/label_low"
  3814. +                android:textColor="@android:color/white"
  3815. +                android:textSize="12sp" />
  3816. +
  3817. +            <TextView
  3818. +                android:id="@+id/textViewLow"
  3819. +                android:layout_width="wrap_content"
  3820. +                android:layout_height="wrap_content"
  3821. +                android:layout_marginLeft="2dp"
  3822. +                android:text="13630.931"
  3823. +                android:textColor="@android:color/white"
  3824. +                android:textSize="12sp"
  3825. +                android:textStyle="bold" />
  3826. +
  3827. +            <TextView
  3828. +                android:layout_width="wrap_content"
  3829. +                android:layout_height="wrap_content"
  3830. +                android:layout_marginLeft="4dp"
  3831. +                android:text="@string/label_change"
  3832. +                android:textColor="@android:color/white"
  3833. +                android:textSize="12sp" />
  3834. +
  3835. +            <TextView
  3836. +                android:id="@+id/textViewChange"
  3837. +                android:layout_width="wrap_content"
  3838. +                android:layout_height="wrap_content"
  3839. +                android:layout_marginLeft="2dp"
  3840. +                android:text="-10%"
  3841. +                android:textColor="@android:color/white"
  3842. +                android:textSize="12sp"
  3843. +                android:textStyle="bold" />
  3844. +
  3845. +        </LinearLayout>
  3846. +
  3847. +        <FrameLayout
  3848. +            android:layout_width="match_parent"
  3849. +            android:layout_height="match_parent">
  3850. +
  3851. +            <com.github.mikephil.charting.charts.CombinedChart
  3852. +                android:id="@+id/chart"
  3853. +                android:layout_width="match_parent"
  3854. +                android:layout_height="match_parent"
  3855. +                android:layout_marginTop="4dp"
  3856. +                android:visibility="invisible" />
  3857. +
  3858. +            <LinearLayout
  3859. +                android:id="@+id/layoutChartLoading"
  3860. +                android:layout_width="match_parent"
  3861. +                android:layout_height="match_parent"
  3862. +                android:gravity="center"
  3863. +                android:orientation="vertical">
  3864. +
  3865. +                <com.wang.avi.AVLoadingIndicatorView
  3866. +                    style="@style/AVLoadingIndicatorView"
  3867. +                    android:layout_width="wrap_content"
  3868. +                    android:layout_height="wrap_content"
  3869. +                    android:layout_marginBottom="10dp"
  3870. +                    android:visibility="visible"
  3871. +                    app:indicatorColor="@android:color/white"
  3872. +                    app:indicatorName="LineScalePulseOutIndicator" />
  3873. +
  3874. +                <TextView
  3875. +                    android:layout_width="wrap_content"
  3876. +                    android:layout_height="wrap_content"
  3877. +                    android:text="@string/loading_candle_data"
  3878. +                    android:textColor="@android:color/white" />
  3879. +
  3880. +            </LinearLayout>
  3881. +
  3882. +            <LinearLayout
  3883. +                android:id="@+id/layoutLoadingError"
  3884. +                android:layout_width="match_parent"
  3885. +                android:layout_height="match_parent"
  3886. +                android:gravity="center"
  3887. +                android:orientation="vertical"
  3888. +                android:visibility="invisible">
  3889. +
  3890. +                <ImageView
  3891. +                    android:layout_width="wrap_content"
  3892. +                    android:layout_height="wrap_content"
  3893. +                    android:layout_marginBottom="10dp"
  3894. +                    android:src="@mipmap/error_small" />
  3895. +
  3896. +                <TextView
  3897. +                    android:layout_width="wrap_content"
  3898. +                    android:layout_height="wrap_content"
  3899. +                    android:text="@string/loading_candle_data_failed"
  3900. +                    android:textColor="@android:color/white" />
  3901. +
  3902. +            </LinearLayout>
  3903. +        </FrameLayout>
  3904. +    </RelativeLayout>
  3905. +
  3906. +    <RadioGroup
  3907. +        android:id="@+id/viewPagerSwitcher"
  3908. +        android:layout_width="match_parent"
  3909. +        android:layout_height="wrap_content"
  3910. +        android:background="#474545"
  3911. +        android:checkedButton="@+id/buyButton"
  3912. +        android:gravity="center"
  3913. +        android:orientation="horizontal">
  3914. +
  3915. +        <RadioButton
  3916. +            android:id="@+id/buyButton"
  3917. +            style="@style/EvrazCustomSwitchStyle"
  3918. +            android:layout_width="wrap_content"
  3919. +            android:layout_height="wrap_content"
  3920. +            android:text="@string/buy" />
  3921. +
  3922. +        <RadioButton
  3923. +            android:id="@+id/sellButton"
  3924. +            style="@style/EvrazCustomSwitchStyle"
  3925. +            android:layout_width="wrap_content"
  3926. +            android:layout_height="wrap_content"
  3927. +            android:text="@string/sell" />
  3928. +
  3929. +        <RadioButton
  3930. +            android:id="@+id/ordersButton"
  3931. +            style="@style/EvrazCustomSwitchStyle"
  3932. +            android:layout_width="wrap_content"
  3933. +            android:layout_height="wrap_content"
  3934. +            android:text="@string/orders" />
  3935. +
  3936. +        <RadioButton
  3937. +            android:id="@+id/myOrdersButton"
  3938. +            style="@style/EvrazCustomSwitchStyle"
  3939. +            android:layout_width="wrap_content"
  3940. +            android:layout_height="wrap_content"
  3941. +            android:text="@string/my_orders" />
  3942. +
  3943. +
  3944. +    </RadioGroup>
  3945. +
  3946. +    <View
  3947. +        android:layout_width="match_parent"
  3948. +        android:layout_height="1dp"
  3949. +        android:background="@color/beige_color" />
  3950. +
  3951. +    <com.bitshares.bitshareswallet.NonScrollViewPager
  3952. +        android:id="@+id/viewPager"
  3953. +        android:layout_width="match_parent"
  3954. +        android:layout_height="match_parent"
  3955. +        android:background="@android:color/black" />
  3956. +
  3957. +</LinearLayout>
  3958. diff --git a/evraz-wallet/app/src/main/res/layout/new_fragment_transactions.xml b/evraz-wallet/app/src/main/res/layout/new_fragment_transactions.xml
  3959. new file mode 100644
  3960. index 0000000..66ac81d
  3961. --- /dev/null
  3962. +++ b/evraz-wallet/app/src/main/res/layout/new_fragment_transactions.xml
  3963. @@ -0,0 +1,80 @@
  3964. +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3965. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  3966. +    xmlns:tools="http://schemas.android.com/tools"
  3967. +    android:layout_width="match_parent"
  3968. +    android:layout_height="match_parent"
  3969. +    android:gravity="center_horizontal"
  3970. +    android:orientation="vertical"
  3971. +    tools:context="com.bitshares.bitshareswallet.TransactionsFragment">
  3972. +
  3973. +    <TextView
  3974. +        style="@style/EvrazTitle"
  3975. +        android:layout_width="match_parent"
  3976. +        android:background="@android:color/black"
  3977. +        android:paddingBottom="24dp"
  3978. +        android:paddingTop="24dp"
  3979. +        android:text="@string/transactions"
  3980. +        app:layout_constraintEnd_toEndOf="parent"
  3981. +        app:layout_constraintStart_toStartOf="parent" />
  3982. +
  3983. +    <View
  3984. +        android:layout_width="match_parent"
  3985. +        android:layout_height="1dp"
  3986. +        android:background="@color/grey" />
  3987. +
  3988. +    <FrameLayout
  3989. +        android:layout_width="match_parent"
  3990. +        android:layout_height="match_parent">
  3991. +
  3992. +        <android.support.v7.widget.RecyclerView
  3993. +            android:id="@+id/recyclerView"
  3994. +            android:layout_width="match_parent"
  3995. +            android:layout_height="match_parent"
  3996. +            android:background="@color/dark_gray_color" />
  3997. +
  3998. +        <LinearLayout
  3999. +            android:id="@+id/layoutChartLoading"
  4000. +            android:layout_width="match_parent"
  4001. +            android:layout_height="match_parent"
  4002. +            android:gravity="center"
  4003. +            android:orientation="vertical">
  4004. +
  4005. +            <com.wang.avi.AVLoadingIndicatorView
  4006. +                style="@style/AVLoadingIndicatorView"
  4007. +                android:layout_width="wrap_content"
  4008. +                android:layout_height="wrap_content"
  4009. +                android:layout_marginBottom="10dp"
  4010. +                android:visibility="visible"
  4011. +                app:indicatorColor="@color/grey"
  4012. +                app:indicatorName="BallPulseIndicator" />
  4013. +
  4014. +            <TextView
  4015. +                android:layout_width="wrap_content"
  4016. +                android:layout_height="wrap_content"
  4017. +                android:text="@string/loading_history_data"
  4018. +                android:textColor="@color/grey" />
  4019. +
  4020. +        </LinearLayout>
  4021. +
  4022. +        <LinearLayout
  4023. +            android:id="@+id/layoutLoadingError"
  4024. +            android:layout_width="match_parent"
  4025. +            android:layout_height="match_parent"
  4026. +            android:gravity="center"
  4027. +            android:orientation="vertical">
  4028. +
  4029. +            <ImageView
  4030. +                android:layout_width="wrap_content"
  4031. +                android:layout_height="wrap_content"
  4032. +                android:layout_marginBottom="10dp"
  4033. +                android:src="@mipmap/error_small" />
  4034. +
  4035. +            <TextView
  4036. +                android:layout_width="wrap_content"
  4037. +                android:layout_height="wrap_content"
  4038. +                android:text="@string/loading_history_failed"
  4039. +                android:textColor="@android:color/white" />
  4040. +
  4041. +        </LinearLayout>
  4042. +    </FrameLayout>
  4043. +</LinearLayout>
  4044. diff --git a/evraz-wallet/app/src/main/res/layout/new_fragment_wallet.xml b/evraz-wallet/app/src/main/res/layout/new_fragment_wallet.xml
  4045. new file mode 100644
  4046. index 0000000..e8364ef
  4047. --- /dev/null
  4048. +++ b/evraz-wallet/app/src/main/res/layout/new_fragment_wallet.xml
  4049. @@ -0,0 +1,96 @@
  4050. +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  4051. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  4052. +    xmlns:tools="http://schemas.android.com/tools"
  4053. +    android:layout_width="match_parent"
  4054. +    android:layout_height="match_parent"
  4055. +    android:orientation="vertical"
  4056. +    tools:context="com.bitshares.bitshareswallet.WalletFragment">
  4057. +
  4058. +    <LinearLayout
  4059. +        android:layout_width="match_parent"
  4060. +        android:layout_height="wrap_content"
  4061. +        android:background="@color/background_color"
  4062. +        android:orientation="vertical"
  4063. +        android:visibility="gone">
  4064. +
  4065. +        <!-- TODO: Update blank fragment layout -->
  4066. +        <LinearLayout
  4067. +            android:layout_width="match_parent"
  4068. +            android:layout_height="85dp"
  4069. +            android:orientation="vertical"
  4070. +            android:visibility="visible">
  4071. +
  4072. +            <TextView
  4073. +                android:id="@+id/textTotalBalance"
  4074. +                android:layout_width="wrap_content"
  4075. +                android:layout_height="50dp"
  4076. +                android:layout_gravity="bottom|center_horizontal"
  4077. +                android:gravity="center"
  4078. +                android:text="@string/main_activity_loading"
  4079. +                android:textColor="@color/colorAccentLight"
  4080. +                android:textSize="40sp" />
  4081. +
  4082. +            <TextView
  4083. +                android:id="@+id/textViewCurrency"
  4084. +                android:layout_width="match_parent"
  4085. +                android:layout_height="wrap_content"
  4086. +                android:gravity="center"
  4087. +                android:text="= 1,234,555 USD (0.9231 USD/BTS)"
  4088. +                android:textColor="@android:color/white"
  4089. +                android:visibility="invisible" />
  4090. +
  4091. +        </LinearLayout>
  4092. +
  4093. +
  4094. +        <!-- <android.support.design.widget.TabLayout
  4095. +             android:id="@+id/tabLayout"
  4096. +             android:layout_width="match_parent"
  4097. +             android:layout_height="wrap_content"
  4098. +             android:background="@android:color/transparent"
  4099. +             android:layout_marginBottom="4dp"
  4100. +             app:tabIndicatorColor="@android:color/white"
  4101. +             app:tabMode="fixed"
  4102. +             app:tabSelectedTextColor="@android:color/white"
  4103. +             app:tabTextColor="@android:color/white" />-->
  4104. +    </LinearLayout>
  4105. +
  4106. +
  4107. +    <RadioGroup
  4108. +        android:id="@+id/viewPagerSwitcher"
  4109. +        android:layout_width="match_parent"
  4110. +        android:layout_height="wrap_content"
  4111. +        android:background="#474545"
  4112. +        android:checkedButton="@+id/balanceButton"
  4113. +        android:gravity="center"
  4114. +        android:orientation="horizontal">
  4115. +
  4116. +        <RadioButton
  4117. +            android:id="@+id/balanceButton"
  4118. +            style="@style/EvrazCustomSwitchStyle"
  4119. +            android:layout_width="wrap_content"
  4120. +            android:layout_height="wrap_content"
  4121. +            android:text="@string/balance" />
  4122. +
  4123. +        <RadioButton
  4124. +            android:id="@+id/sendButton"
  4125. +            style="@style/EvrazCustomSwitchStyle"
  4126. +            android:layout_width="wrap_content"
  4127. +            android:layout_height="wrap_content"
  4128. +            android:text="@string/send" />
  4129. +
  4130. +        <RadioButton
  4131. +            android:id="@+id/exchangeButton"
  4132. +            style="@style/EvrazCustomSwitchStyle"
  4133. +            android:layout_width="wrap_content"
  4134. +            android:layout_height="wrap_content"
  4135. +            android:text="@string/exchange" />
  4136. +    </RadioGroup>
  4137. +
  4138. +
  4139. +    <com.bitshares.bitshareswallet.NonScrollViewPager
  4140. +        android:id="@+id/fw_viewPager"
  4141. +        android:layout_width="match_parent"
  4142. +        android:layout_height="match_parent"
  4143. +        android:background="@android:color/black"
  4144. +        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
  4145. +</LinearLayout>
  4146. diff --git a/evraz-wallet/app/src/main/res/layout/new_recyclerview_item_balances.xml b/evraz-wallet/app/src/main/res/layout/new_recyclerview_item_balances.xml
  4147. new file mode 100644
  4148. index 0000000..815c19e
  4149. --- /dev/null
  4150. +++ b/evraz-wallet/app/src/main/res/layout/new_recyclerview_item_balances.xml
  4151. @@ -0,0 +1,44 @@
  4152. +<?xml version="1.0" encoding="utf-8"?>
  4153. +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  4154. +    xmlns:tools="http://schemas.android.com/tools"
  4155. +    android:layout_width="match_parent"
  4156. +    android:layout_height="wrap_content"
  4157. +    android:orientation="horizontal">
  4158. +
  4159. +    <TextView
  4160. +        android:id="@+id/textViewUnit"
  4161. +        style="@style/EvrazValueTableStyle"
  4162. +        tools:text="@string/assets" />
  4163. +
  4164. +    <View
  4165. +        android:layout_width="1dp"
  4166. +        android:layout_height="match_parent"
  4167. +        android:background="@color/beige_color" />
  4168. +
  4169. +    <TextView
  4170. +        android:id="@+id/textViewNumber"
  4171. +        style="@style/EvrazValueTableStyle"
  4172. +        tools:text="@string/short_count" />
  4173. +
  4174. +    <View
  4175. +        android:layout_width="1dp"
  4176. +        android:layout_height="match_parent"
  4177. +        android:background="@color/beige_color" />
  4178. +
  4179. +    <TextView
  4180. +        android:id="@+id/textExchangeRate"
  4181. +        style="@style/EvrazValueTableStyle"
  4182. +        tools:text="@string/short_count" />
  4183. +
  4184. +    <View
  4185. +        android:layout_width="1dp"
  4186. +        android:layout_height="match_parent"
  4187. +        android:background="@color/beige_color" />
  4188. +
  4189. +    <TextView
  4190. +        android:id="@+id/textUSDBalance"
  4191. +        style="@style/EvrazValueTableStyle"
  4192. +        tools:text="@string/short_count" />
  4193. +
  4194. +
  4195. +</LinearLayout>
  4196. \ No newline at end of file
  4197. diff --git a/evraz-wallet/app/src/main/res/layout/new_recyclerview_item_currency_pair.xml b/evraz-wallet/app/src/main/res/layout/new_recyclerview_item_currency_pair.xml
  4198. new file mode 100644
  4199. index 0000000..d439a85
  4200. --- /dev/null
  4201. +++ b/evraz-wallet/app/src/main/res/layout/new_recyclerview_item_currency_pair.xml
  4202. @@ -0,0 +1,71 @@
  4203. +<?xml version="1.0" encoding="utf-8"?>
  4204. +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  4205. +    android:layout_width="match_parent"
  4206. +    android:layout_height="70dp">
  4207. +
  4208. +    <View
  4209. +        android:id="@+id/viewSelected"
  4210. +        android:layout_width="3dp"
  4211. +        android:layout_height="match_parent"
  4212. +        android:background="@color/background_color"
  4213. +        android:visibility="invisible" />
  4214. +
  4215. +    <ImageView
  4216. +        android:id="@+id/imageViewCurrency"
  4217. +        android:layout_width="wrap_content"
  4218. +        android:layout_height="match_parent"
  4219. +        android:layout_centerVertical="true"
  4220. +        android:layout_marginLeft="12dp"
  4221. +        android:layout_marginRight="8dp"
  4222. +        android:scaleType="center"
  4223. +        android:src="@mipmap/create_account" />
  4224. +
  4225. +    <TextView
  4226. +        android:id="@+id/textViewCurrencyPair"
  4227. +        android:layout_width="wrap_content"
  4228. +        android:layout_height="match_parent"
  4229. +        android:layout_marginLeft="8dp"
  4230. +        android:layout_toLeftOf="@+id/textViewPrice"
  4231. +        android:layout_toRightOf="@+id/imageViewCurrency"
  4232. +        android:gravity="center_vertical"
  4233. +        android:text="BTC : USD"
  4234. +        android:textAllCaps="true"
  4235. +        android:textColor="@color/beige_color"
  4236. +        android:textSize="21sp"
  4237. +        android:textStyle="bold" />
  4238. +
  4239. +    <TextView
  4240. +        android:id="@+id/textViewPrice"
  4241. +        android:layout_width="wrap_content"
  4242. +        android:layout_height="match_parent"
  4243. +        android:layout_marginLeft="5dp"
  4244. +        android:layout_marginRight="3dp"
  4245. +        android:layout_toLeftOf="@+id/textView24h"
  4246. +
  4247. +        android:gravity="center_vertical|right"
  4248. +        android:text="N/A"
  4249. +        android:textColor="@color/beige_color"
  4250. +        android:textSize="21sp" />
  4251. +
  4252. +    <TextView
  4253. +        android:id="@+id/textView24h"
  4254. +        android:layout_width="54dp"
  4255. +        android:layout_height="20dp"
  4256. +        android:layout_alignParentRight="true"
  4257. +        android:layout_centerVertical="true"
  4258. +        android:layout_marginLeft="15dp"
  4259. +        android:layout_marginRight="13dp"
  4260. +        android:background="@drawable/oval_green_background"
  4261. +        android:gravity="center"
  4262. +        android:text="-10%"
  4263. +        android:textColor="@android:color/black"
  4264. +        android:textSize="12sp" />
  4265. +
  4266. +    <View
  4267. +        android:layout_width="match_parent"
  4268. +        android:layout_height="1dp"
  4269. +        android:layout_alignParentBottom="true"
  4270. +        android:background="@color/grey" />
  4271. +
  4272. +
  4273. +</RelativeLayout>
  4274. \ No newline at end of file
  4275. diff --git a/evraz-wallet/app/src/main/res/layout/new_recyclerview_item_transactions.xml b/evraz-wallet/app/src/main/res/layout/new_recyclerview_item_transactions.xml
  4276. new file mode 100644
  4277. index 0000000..ab99c61
  4278. --- /dev/null
  4279. +++ b/evraz-wallet/app/src/main/res/layout/new_recyclerview_item_transactions.xml
  4280. @@ -0,0 +1,100 @@
  4281. +<?xml version="1.0" encoding="utf-8"?>
  4282. +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  4283. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  4284. +    android:layout_width="match_parent"
  4285. +    android:layout_height="wrap_content"
  4286. +    android:orientation="vertical">
  4287. +
  4288. +    <RelativeLayout
  4289. +        android:layout_width="match_parent"
  4290. +        android:layout_height="wrap_content"
  4291. +        android:layout_margin="8dp">
  4292. +
  4293. +        <ImageView
  4294. +            android:id="@+id/imageView"
  4295. +            android:layout_width="40dp"
  4296. +            android:layout_height="60dp"
  4297. +            android:layout_gravity="center"
  4298. +            android:layout_marginRight="16dp"
  4299. +            android:scaleType="center"
  4300. +            app:srcCompat="@mipmap/ic_launcher" />
  4301. +
  4302. +        <LinearLayout
  4303. +            android:id="@+id/layoutTransactionDetail"
  4304. +            android:layout_width="match_parent"
  4305. +            android:layout_height="wrap_content"
  4306. +            android:layout_centerVertical="true"
  4307. +            android:layout_toLeftOf="@+id/linearLayout"
  4308. +            android:layout_toRightOf="@+id/imageView"
  4309. +            android:orientation="vertical">
  4310. +
  4311. +            <TextView
  4312. +                android:id="@+id/textViewOperationDetail"
  4313. +                android:layout_width="match_parent"
  4314. +                android:layout_height="wrap_content"
  4315. +                android:lineSpacingExtra="4sp"
  4316. +                android:textColor="@android:color/white"
  4317. +                android:textSize="14sp" />
  4318. +
  4319. +            <LinearLayout
  4320. +                android:id="@+id/layoutMemo"
  4321. +                android:layout_width="match_parent"
  4322. +                android:layout_height="wrap_content"
  4323. +                android:orientation="horizontal"
  4324. +                android:visibility="gone">
  4325. +
  4326. +                <TextView
  4327. +                    android:id="@+id/textViewMemo"
  4328. +                    android:layout_width="wrap_content"
  4329. +                    android:layout_height="wrap_content"
  4330. +                    android:ellipsize="end"
  4331. +                    android:lines="1"
  4332. +                    android:text="@string/transaction_memo_hint"
  4333. +                    android:textColor="@android:color/white" />
  4334. +
  4335. +                <ImageView
  4336. +                    android:id="@+id/imageViewMemoLock"
  4337. +                    android:layout_width="wrap_content"
  4338. +                    android:layout_height="wrap_content"
  4339. +                    android:layout_marginLeft="2dp"
  4340. +                    android:layout_marginTop="2dp"
  4341. +                    android:src="@mipmap/lock" />
  4342. +            </LinearLayout>
  4343. +
  4344. +
  4345. +        </LinearLayout>
  4346. +
  4347. +        <LinearLayout
  4348. +            android:id="@+id/linearLayout"
  4349. +            android:layout_width="100dp"
  4350. +            android:layout_height="60dp"
  4351. +            android:layout_alignParentRight="true"
  4352. +            android:layout_margin="8dp"
  4353. +            android:gravity="center_vertical|right"
  4354. +            android:orientation="vertical">
  4355. +
  4356. +            <TextView
  4357. +                android:id="@+id/textViewOperation"
  4358. +                android:layout_width="wrap_content"
  4359. +                android:layout_height="wrap_content"
  4360. +                android:text="Transfer"
  4361. +                android:textColor="@android:color/white"
  4362. +                android:textSize="14sp" />
  4363. +
  4364. +            <TextView
  4365. +                android:id="@+id/textViewTime"
  4366. +                android:layout_width="wrap_content"
  4367. +                android:layout_height="wrap_content"
  4368. +                android:gravity="right"
  4369. +                android:text="1 year ago"
  4370. +                android:textColor="@android:color/white"
  4371. +                android:textSize="14sp" />
  4372. +        </LinearLayout>
  4373. +    </RelativeLayout>
  4374. +
  4375. +    <View
  4376. +        android:id="@+id/separator"
  4377. +        android:layout_width="match_parent"
  4378. +        android:layout_height="1dp"
  4379. +        android:background="@color/grey" />
  4380. +</LinearLayout>
  4381. \ No newline at end of file
  4382. diff --git a/evraz-wallet/app/src/main/res/layout/new_spinner_style.xml b/evraz-wallet/app/src/main/res/layout/new_spinner_style.xml
  4383. new file mode 100644
  4384. index 0000000..21a1685
  4385. --- /dev/null
  4386. +++ b/evraz-wallet/app/src/main/res/layout/new_spinner_style.xml
  4387. @@ -0,0 +1,9 @@
  4388. +<?xml version="1.0" encoding="UTF-8"?>
  4389. +<TextView
  4390. +    xmlns:android="http://schemas.android.com/apk/res/android"
  4391. +    android:layout_width="match_parent"
  4392. +    android:id="@android:id/text1"
  4393. +    android:layout_height="match_parent"
  4394. +    android:padding="16dp"
  4395. +    android:background="@color/gray_color"
  4396. +    android:textColor="@color/table_gray_color" />
  4397. \ No newline at end of file
  4398. diff --git a/evraz-wallet/app/src/main/res/layout/new_view_my_order_item.xml b/evraz-wallet/app/src/main/res/layout/new_view_my_order_item.xml
  4399. new file mode 100644
  4400. index 0000000..ade71c0
  4401. --- /dev/null
  4402. +++ b/evraz-wallet/app/src/main/res/layout/new_view_my_order_item.xml
  4403. @@ -0,0 +1,53 @@
  4404. +<?xml version="1.0" encoding="utf-8"?>
  4405. +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  4406. +    xmlns:tools="http://schemas.android.com/tools"
  4407. +    android:layout_width="match_parent"
  4408. +    android:layout_height="wrap_content"
  4409. +    xmlns:app="http://schemas.android.com/apk/res-auto"
  4410. +    android:orientation="horizontal">
  4411. +
  4412. +    <TextView
  4413. +        android:id="@+id/voi_txt_operation"
  4414. +        style="@style/EvrazValueTableStyle"
  4415. +        android:layout_weight="90"
  4416. +        tools:text="@string/assets" />
  4417. +
  4418. +    <View
  4419. +        android:layout_width="1dp"
  4420. +        android:layout_height="match_parent"
  4421. +        android:background="@color/beige_color" />
  4422. +
  4423. +    <TextView
  4424. +        android:id="@+id/voi_txt_price"
  4425. +        style="@style/EvrazValueTableStyle"
  4426. +        android:layout_weight="35"
  4427. +        tools:text="@string/short_count" />
  4428. +
  4429. +    <!--<View
  4430. +        android:layout_width="1dp"
  4431. +        android:layout_height="match_parent"
  4432. +        android:background="@color/beige_color" />
  4433. +
  4434. +    <TextView
  4435. +        android:id="@+id/voi_txt_price_usd"
  4436. +        style="@style/EvrazValueTableStyle"
  4437. +        android:layout_weight="60"
  4438. +        tools:text="@string/short_count" />-->
  4439. +
  4440. +    <View
  4441. +        android:layout_width="1dp"
  4442. +        android:layout_height="match_parent"
  4443. +        android:background="@color/beige_color" />
  4444. +
  4445. +    <ImageView
  4446. +        android:id="@+id/voi_cacel"
  4447. +        android:layout_width="0dp"
  4448. +        android:layout_height="match_parent"
  4449. +        android:layout_weight="40"
  4450. +        android:padding="8dp"
  4451. +        android:scaleType="fitCenter"
  4452. +        app:srcCompat="@drawable/ic_krestik"
  4453. +        tools:text="@string/short_count" />
  4454. +
  4455. +
  4456. +</LinearLayout>
  4457. \ No newline at end of file
  4458. diff --git a/evraz-wallet/app/src/main/res/layout/new_view_order_item.xml b/evraz-wallet/app/src/main/res/layout/new_view_order_item.xml
  4459. new file mode 100644
  4460. index 0000000..229e7f3
  4461. --- /dev/null
  4462. +++ b/evraz-wallet/app/src/main/res/layout/new_view_order_item.xml
  4463. @@ -0,0 +1,24 @@
  4464. +<?xml version="1.0" encoding="utf-8"?>
  4465. +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  4466. +    xmlns:tools="http://schemas.android.com/tools"
  4467. +    android:layout_width="match_parent"
  4468. +    android:layout_height="wrap_content"
  4469. +    android:orientation="horizontal">
  4470. +
  4471. +    <TextView
  4472. +        android:id="@+id/price_text"
  4473. +        style="@style/EvrazValueTableStyle"
  4474. +        tools:text="@string/assets" />
  4475. +
  4476. +    <View
  4477. +        android:layout_width="1dp"
  4478. +        android:layout_height="match_parent"
  4479. +        android:background="@color/beige_color" />
  4480. +
  4481. +    <TextView
  4482. +        android:id="@+id/bts_text"
  4483. +        style="@style/EvrazValueTableStyle"
  4484. +        tools:text="@string/short_count" />
  4485. +
  4486. +
  4487. +</LinearLayout>
  4488. diff --git a/evraz-wallet/app/src/main/res/mipmap-hdpi/ic_evraz.png b/evraz-wallet/app/src/main/res/mipmap-hdpi/ic_evraz.png
  4489. new file mode 100644
  4490. index 0000000..959fd6f
  4491. Binary files /dev/null and b/evraz-wallet/app/src/main/res/mipmap-hdpi/ic_evraz.png differ
  4492. diff --git a/bitshares_andriod_wallet/app/src/main/res/mipmap-hdpi/ic_launcher.png b/evraz-wallet/app/src/main/res/mipmap-hdpi/ic_launcher.png
  4493. index cde69bc..3888344 100644
  4494. Binary files a/bitshares_andriod_wallet/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/evraz-wallet/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
  4495. diff --git a/evraz-wallet/app/src/main/res/mipmap-mdpi/ic_evraz.png b/evraz-wallet/app/src/main/res/mipmap-mdpi/ic_evraz.png
  4496. new file mode 100644
  4497. index 0000000..381236f
  4498. Binary files /dev/null and b/evraz-wallet/app/src/main/res/mipmap-mdpi/ic_evraz.png differ
  4499. diff --git a/bitshares_andriod_wallet/app/src/main/res/mipmap-mdpi/ic_launcher.png b/evraz-wallet/app/src/main/res/mipmap-mdpi/ic_launcher.png
  4500. index c133a0c..a7d33b2 100644
  4501. Binary files a/bitshares_andriod_wallet/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/evraz-wallet/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
  4502. diff --git a/evraz-wallet/app/src/main/res/mipmap-xhdpi/evraz.png b/evraz-wallet/app/src/main/res/mipmap-xhdpi/evraz.png
  4503. new file mode 100644
  4504. index 0000000..ce17bf2
  4505. Binary files /dev/null and b/evraz-wallet/app/src/main/res/mipmap-xhdpi/evraz.png differ
  4506. diff --git a/evraz-wallet/app/src/main/res/mipmap-xhdpi/ic_evraz.png b/evraz-wallet/app/src/main/res/mipmap-xhdpi/ic_evraz.png
  4507. new file mode 100644
  4508. index 0000000..6a8411c
  4509. Binary files /dev/null and b/evraz-wallet/app/src/main/res/mipmap-xhdpi/ic_evraz.png differ
  4510. diff --git a/bitshares_andriod_wallet/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/evraz-wallet/app/src/main/res/mipmap-xhdpi/ic_launcher.png
  4511. index bfa42f0..3bb483f 100644
  4512. Binary files a/bitshares_andriod_wallet/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/evraz-wallet/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
  4513. diff --git a/evraz-wallet/app/src/main/res/mipmap-xxhdpi/evraz.png b/evraz-wallet/app/src/main/res/mipmap-xxhdpi/evraz.png
  4514. new file mode 100644
  4515. index 0000000..aba04ac
  4516. Binary files /dev/null and b/evraz-wallet/app/src/main/res/mipmap-xxhdpi/evraz.png differ
  4517. diff --git a/evraz-wallet/app/src/main/res/mipmap-xxhdpi/ic_evraz.png b/evraz-wallet/app/src/main/res/mipmap-xxhdpi/ic_evraz.png
  4518. new file mode 100644
  4519. index 0000000..57ba572
  4520. Binary files /dev/null and b/evraz-wallet/app/src/main/res/mipmap-xxhdpi/ic_evraz.png differ
  4521. diff --git a/bitshares_andriod_wallet/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/evraz-wallet/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
  4522. index 324e72c..c2b656f 100644
  4523. Binary files a/bitshares_andriod_wallet/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/evraz-wallet/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
  4524. diff --git a/evraz-wallet/app/src/main/res/mipmap-xxxhdpi/ic_evraz.png b/evraz-wallet/app/src/main/res/mipmap-xxxhdpi/ic_evraz.png
  4525. new file mode 100644
  4526. index 0000000..c341bb2
  4527. Binary files /dev/null and b/evraz-wallet/app/src/main/res/mipmap-xxxhdpi/ic_evraz.png differ
  4528. diff --git a/bitshares_andriod_wallet/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/evraz-wallet/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  4529. index aee44e1..e2e4c19 100644
  4530. Binary files a/bitshares_andriod_wallet/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/evraz-wallet/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
  4531. diff --git a/bitshares_andriod_wallet/app/src/main/res/values/arrays.xml b/evraz-wallet/app/src/main/res/values/arrays.xml
  4532. index df3469e..bc4256e 100644
  4533. --- a/bitshares_andriod_wallet/app/src/main/res/values/arrays.xml
  4534. +++ b/evraz-wallet/app/src/main/res/values/arrays.xml
  4535. @@ -15,6 +15,10 @@
  4536.      </string-array>
  4537.  
  4538.      <string-array name="quotation_currency_pair_options">
  4539. +        <item>EVRAZ:BTS</item>
  4540. +        <item>EVRAZ:USD</item>
  4541. +        <item>EVRAZ:RUBLE</item>
  4542. +        <item>EVRAZ:ESCROW.RUBLE</item>
  4543.          <item>BTS:USD</item>
  4544.          <item>BTS:CNY</item>
  4545.          <item>BTC:BTS</item>
  4546. @@ -23,16 +27,15 @@
  4547.          <item>ETH:BTS</item>
  4548.          <item>ETH:USD</item>
  4549.          <item>ETH:CNY</item>
  4550. -        <item>HERO:BTS</item>
  4551. -        <item>OBITS:BTS</item>
  4552. -        <item>SMOKE:BTS</item>
  4553. -        <item>USDT:USD</item>
  4554. -        <item>OCT:CNY</item>
  4555.          <item>YOYOW:CNY</item>
  4556.          <item>DASH:BTS</item>
  4557.      </string-array>
  4558.  
  4559.      <string-array name="quotation_currency_pair_values">
  4560. +        <item>EVRAZ:BTS</item>
  4561. +        <item>EVRAZ:USD</item>
  4562. +        <item>EVRAZ:RUBLE</item>
  4563. +        <item>EVRAZ:ESCROW.RUBLE</item>
  4564.          <item>BTS:USD</item>
  4565.          <item>BTS:CNY</item>
  4566.          <item>OPEN.BTC:BTS</item>
  4567. @@ -41,11 +44,6 @@
  4568.          <item>OPEN.ETH:BTS</item>
  4569.          <item>OPEN.ETH:USD</item>
  4570.          <item>OPEN.ETH:CNY</item>
  4571. -        <item>HERO:BTS</item>
  4572. -        <item>OBITS:BTS</item>
  4573. -        <item>SMOKE:BTS</item>
  4574. -        <item>OPEN.USDT:USD</item>
  4575. -        <item>OCT:CNY</item>
  4576.          <item>YOYOW:CNY</item>
  4577.          <item>OPEN.DASH:BTS</item>
  4578.      </string-array>
  4579. diff --git a/bitshares_andriod_wallet/app/src/main/res/values/colors.xml b/evraz-wallet/app/src/main/res/values/colors.xml
  4580. index af933b4..499555a 100644
  4581. --- a/bitshares_andriod_wallet/app/src/main/res/values/colors.xml
  4582. +++ b/evraz-wallet/app/src/main/res/values/colors.xml
  4583. @@ -1,16 +1,17 @@
  4584.  <?xml version="1.0" encoding="utf-8"?>
  4585.  <resources>
  4586. -    <color name="colorPrimary">#3F51B5</color>
  4587. -    <color name="colorPrimaryDark">#303F9F</color>
  4588. -    <color name="colorAccent">#FF4081</color>
  4589. +    <color name="colorPrimary">#BDBDBD</color>
  4590. +    <color name="colorPrimaryDark">#424242</color>
  4591. +    <color name="colorAccent">#FFAB40</color>
  4592. +    <color name="colorAccentLight">#FFD180</color>
  4593.  
  4594. -    <color name="background_color">#0C318D</color>
  4595. +    <color name="background_color">#212121</color>
  4596.  
  4597.      <color name="black_overlay">#66000000</color>
  4598.      <color name="blue_background">#0099cc</color>
  4599.      <color name="grey">#D3D3D3</color>
  4600.      <color name="light_grey">#F2F2F2</color>
  4601. -    <color name="blue">#2d95ff</color>
  4602. +    <color name="blue">#FFAB40</color>
  4603.      <color name="red">#fe0000</color>
  4604.  
  4605.      <color name="label_black">#282828</color>
  4606. @@ -27,4 +28,13 @@
  4607.      <color name="ma5">#823E66</color>
  4608.      <color name="ma10">#B99C7A</color>
  4609.      <color name="ma20">#3C7193</color>
  4610. +
  4611. +    <!--new-->
  4612. +    <color name="beige_color">#f6efcc</color>
  4613. +    <color name="gray_color">#424242</color>
  4614. +    <color name="table_gray_color">#ededed</color>
  4615. +    <color name="light_gray_color">#938e8e</color>
  4616. +    <color name="dark_gray_color">#2e2e2e</color>
  4617. +    <color name="light_green_color">#7fe478</color>
  4618. +    <color name="light_red_color">#f07777</color>
  4619.  </resources>
  4620. diff --git a/bitshares_andriod_wallet/app/src/main/res/values/strings.xml b/evraz-wallet/app/src/main/res/values/strings.xml
  4621. index eef50e1..1900456 100644
  4622. --- a/bitshares_andriod_wallet/app/src/main/res/values/strings.xml
  4623. +++ b/evraz-wallet/app/src/main/res/values/strings.xml
  4624. @@ -1,7 +1,57 @@
  4625.  <resources>
  4626. -    <string name="app_name_full">Bitshares Wallet</string>
  4627. -    <string name="app_name">BTS Wallet</string>
  4628. -
  4629. +    <string name="app_name_full">Evraz Wallet</string>
  4630. +    <string name="app_name">Evraz Wallet</string>
  4631. +    <string name="auth_title" translatable="false">Bitshares blockhain</string>
  4632. +
  4633. +    <string name="back">back</string>
  4634. +    <string name="registration">Sign up</string>
  4635. +    <string name="auth">Log in</string>
  4636. +    <string name="wallet">Wallet</string>
  4637. +    <string name="login_description">Application log in is implemented only through Account Model</string>
  4638. +    <string name="app_description">
  4639. +        Current mobile application allows to register through Account Model. Account Model enable to manage the account from anywhere, using only password and without loading .bin file.\n\n
  4640. +        Keys for Account will be received with using your password. They won\'t be saved in browser or central server, that\'s why it is necessary  to make sure that you\'ve recognized the password.\n\n
  4641. +        Please enter desired account name. This name will be registered openly in blockchain and be the identifier for any of your transactions.\n\n
  4642. +        The name should include more than 6 characters with dash, numbers and u.c.
  4643. +    </string>
  4644. +    <string name="continue_registration">To continue the registration</string>
  4645. +    <string name="account_name">Account name</string>
  4646. +    <string name="create_password">Create the password</string>
  4647. +    <string name="confirm_password">Confirm the password</string>
  4648. +    <string name="reg_checkbox_1">I realize that I will lose access to my funds if I lose my password пароль </string>
  4649. +    <string name="reg_checkbox_2">I realize, that nobody can restore my password if I lose or forget it</string>
  4650. +    <string name="reg_checkbox_3">I wrote down or have saved in the other way my password</string>
  4651. +    <string name="balance">Balance</string>
  4652. +    <string name="send">Send</string>
  4653. +    <string name="exchange">Exchange</string>
  4654. +    <string name="exchange_title">My markets</string>
  4655. +    <string name="portfolio">Portfolio</string>
  4656. +    <string name="open_orders">Open orders</string>
  4657. +    <string name="position_provision">Position provision</string>
  4658. +    <string name="transactions">Transactions</string>
  4659. +    <string name="total_usd">Total: %d %s</string>
  4660. +    <string name="assets">Assets</string>
  4661. +    <string name="short_count">Amount</string>
  4662. +    <string name="usd_rate">Rate (%s)</string>
  4663. +    <string name="usd_cost">Cost (%s)</string>
  4664. +    <string name="description">Description</string>
  4665. +    <string name="price">Price</string>
  4666. +    <string name="from">From</string>
  4667. +    <string name="to">To</string>
  4668. +    <string name="count">Amount</string>
  4669. +    <string name="note">Note</string>
  4670. +    <string name="comission">Commission</string>
  4671. +    <string name="undo">Undo</string>
  4672. +    <string name="my_markets">My markets</string>
  4673. +    <string name="trading_schedule">Trading schedule</string>
  4674. +    <string name="buy">Buy</string>
  4675. +    <string name="sell">Sell</string>
  4676. +    <string name="orders">Orders</string>
  4677. +    <string name="cancel">Cancel</string>
  4678. +    <string name="buy_string">%s %s for %s</string>
  4679. +    <string name="orders_to_buy">Orders to buy</string>
  4680. +    <string name="orders_to_sell">Orders to sell</string>
  4681. +    <string name="my_orders">My orders</string>
  4682.      <!--侧边栏-->
  4683.      <string name="navigation_drawer_open">Open navigation drawer</string>
  4684.      <string name="navigation_drawer_close">Close navigation drawer</string>
  4685. @@ -69,7 +119,7 @@
  4686.      <string name="import_activity_account_model">Account Model</string>
  4687.      <string name="title_activity_settings">Settings</string>
  4688.  
  4689. -    <string name="about_activity_text">If you love our app, we appreciate it for getting donation from you.</string>
  4690. +    <string name="about_activity_text">EVRAZ Wallet is the mobile application for Android that is for usage on Bitshares cryptocurrency platform.</string>
  4691.      <string name="about_activity_version">Version</string>
  4692.      <string name="about_activity_button">DONATE</string>
  4693.  
  4694. diff --git a/bitshares_andriod_wallet/app/src/main/res/values/styles.xml b/evraz-wallet/app/src/main/res/values/styles.xml
  4695. index fc36795..f4f3c50 100644
  4696. --- a/bitshares_andriod_wallet/app/src/main/res/values/styles.xml
  4697. +++ b/evraz-wallet/app/src/main/res/values/styles.xml
  4698. @@ -1,21 +1,53 @@
  4699.  <resources>
  4700.  
  4701.      <!-- Base application theme. -->
  4702. -    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
  4703. +    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
  4704.          <!-- Customize your theme here. -->
  4705.          <item name="android:windowBackground">@color/background_color</item>
  4706.          <item name="colorPrimary">@color/colorPrimary</item>
  4707.          <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
  4708. -        <item name="colorAccent">@color/blue</item>
  4709. +        <item name="colorAccent">@color/colorAccent</item>
  4710.          <item name="windowActionBar">false</item>
  4711. +        <item name="android:fontFamily">@font/rosbank_sans_regular</item>
  4712. +
  4713.          <item name="windowNoTitle">true</item>
  4714.          <item name="preferenceTheme">@style/myPreferenceTheme</item>
  4715. +
  4716. +
  4717. +    </style>
  4718. +    <style name="CustomDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
  4719. +        <!--buttons color-->
  4720. +        <item name="colorAccent">@color/colorAccent</item>
  4721. +        <!--title and message color-->
  4722. +        <item name="android:textColorPrimary">@color/table_gray_color</item>
  4723. +        <!--dialog background-->
  4724. +        <item name="android:windowBackground">@color/gray_color</item>
  4725. +
  4726.      </style>
  4727.  
  4728. +
  4729. +
  4730.      <style name="ActivityTheme" parent="AppTheme">
  4731. +        <item name="android:dialogTheme">@style/CustomDialogTheme</item>
  4732. +        <item name="android:alertDialogTheme">@style/CustomDialogTheme</item>
  4733. +        <item name="android:textColorAlertDialogListItem">@color/table_gray_color</item><!--special for ListPreference-->
  4734. +        <item name="android:textColorPrimary">@color/table_gray_color</item><!--special for ListPreference-->
  4735. +        <item name="android:textColorSecondary">@color/table_gray_color</item><!--special for ListPreference-->
  4736.          <item name="android:windowBackground">@color/background_color</item>
  4737.      </style>
  4738.  
  4739. +    <style name="SettingsActivityTheme" parent="ActivityTheme">
  4740. +
  4741. +
  4742. +        <item name="android:background">@color/gray_color</item><!--special for ListPreference-->
  4743. +        <!--  <item name="android:dialogPreferenceStyle">@style/CustomDialogTheme</item>
  4744. +          <item name="android:preferenceStyle">@style/CustomDialogTheme</item>
  4745. +          <item name="android:tabWidgetStyle"> @style/CustomDialogTheme</item>-->
  4746. +
  4747. +
  4748. +    </style>
  4749. +  <!--  <item name="android:textColorAlertDialogListItem">@color/table_gray_color</item>
  4750. +    <item name="colorControlActivated">@color/table_gray_color</item>-->
  4751.      <style name="myPreferenceTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
  4752.  
  4753.      </style>
  4754. @@ -75,5 +107,81 @@
  4755.          <item name="android:backgroundDimEnabled">false</item>
  4756.      </style>
  4757.  
  4758. +    <style name="EvrazCustomSwitchStyle">
  4759. +        <item name="android:gravity">center</item>
  4760. +        <item name="android:maxLines">1</item>
  4761. +        <item name="android:singleLine">true</item>
  4762. +        <item name="android:ellipsize">end</item>
  4763. +        <item name="android:textColor">@drawable/cusrom_switch_text_color</item>
  4764. +        <item name="android:textSize">16sp</item>
  4765. +        <item name="android:button">@null</item>
  4766. +        <item name="android:background">@drawable/custom_switch_item_background</item>
  4767. +        <item name="android:paddingTop">10dp</item>
  4768. +        <item name="android:paddingBottom">10dp</item>
  4769. +        <item name="android:paddingRight">8dp</item>
  4770. +        <item name="android:paddingLeft">8dp</item>
  4771. +    </style>
  4772.  
  4773. +    <style name="EvrazTitle">
  4774. +        <item name="android:layout_width">wrap_content</item>
  4775. +        <item name="android:layout_height">wrap_content</item>
  4776. +        <item name="android:gravity">center</item>
  4777. +        <item name="android:textAllCaps">true</item>
  4778. +        <item name="android:textColor">@color/beige_color</item>
  4779. +        <item name="android:textSize">30sp</item>
  4780. +    </style>
  4781. +
  4782. +    <style name="EvrazTextViewButton">
  4783. +        <item name="android:layout_width">match_parent</item>
  4784. +        <item name="android:layout_height">wrap_content</item>
  4785. +        <item name="android:background">@drawable/btn_default_background_selector</item>
  4786. +        <item name="android:gravity">center</item>
  4787. +        <item name="android:padding">8dp</item>
  4788. +        <item name="android:textColor">@color/beige_color</item>
  4789. +        <item name="android:textSize">20sp</item>
  4790. +    </style>
  4791. +
  4792. +    <style name="EvrazTextHeaderViewStyle">
  4793. +        <item name="android:layout_width">match_parent</item>
  4794. +        <item name="android:layout_height">wrap_content</item>
  4795. +
  4796. +        <item name="android:textAllCaps">true</item>
  4797. +        <item name="android:textColor">@color/beige_color</item>
  4798. +        <item name="android:textSize">15sp</item>
  4799. +
  4800. +    </style>
  4801. +
  4802. +    <style name="EvrazTextHeaderTableStyle">
  4803. +        <item name="android:layout_width">0dp</item>
  4804. +        <item name="android:layout_height">wrap_content</item>
  4805. +        <item name="android:layout_weight">1</item>
  4806. +        <item name="android:padding">8dp</item>
  4807. +        <item name="android:gravity">center</item>
  4808. +        <item name="android:textColor">@color/beige_color</item>
  4809. +        <item name="android:textSize">17sp</item>
  4810. +    </style>
  4811. +
  4812. +    <style name="EvrazTextSellBuyTableStyle" parent="EvrazTextHeaderTableStyle">
  4813. +        <item name="android:textSize">15sp</item>
  4814. +    </style>
  4815. +
  4816. +    <style name="EvrazValueTableStyle" parent="EvrazTextHeaderTableStyle">
  4817. +        <item name="android:textColor">@color/table_gray_color</item>
  4818. +        <item name="android:textSize">12sp</item>
  4819. +        <item name="android:textAllCaps">true</item>
  4820. +    </style>
  4821. +
  4822. +    <style name="EvrazEditTextStyle">
  4823. +        <item name="android:layout_width">match_parent</item>
  4824. +        <item name="android:layout_height">wrap_content</item>
  4825. +        <item name="android:background">@drawable/edit_text_default_background</item>
  4826. +        <item name="android:layout_marginTop">8dp</item>
  4827. +        <item name="android:paddingTop">5dp</item>
  4828. +        <item name="android:paddingBottom">5dp</item>
  4829. +        <item name="android:paddingLeft">10dp</item>
  4830. +        <item name="android:paddingRight">10dp</item>
  4831. +        <item name="android:textColor">@color/beige_color</item>
  4832. +        <item name="android:gravity">center_vertical</item>
  4833. +        <item name="android:singleLine">true</item>
  4834. +    </style>
  4835.  </resources>
  4836. diff --git a/bitshares_andriod_wallet/app/src/main/res/values-es/strings.xml b/evraz-wallet/app/src/main/res/values-es/strings.xml
  4837. index d1acb93..e24675f 100644
  4838. --- a/bitshares_andriod_wallet/app/src/main/res/values-es/strings.xml
  4839. +++ b/evraz-wallet/app/src/main/res/values-es/strings.xml
  4840. @@ -1,140 +1,140 @@
  4841. -<resources>
  4842. -    <string name="app_name_full">Cartera de Bitshares</string>
  4843. -    <string name="app_name">BTS Wallet</string>
  4844. -
  4845. -    <string name="navigation_drawer_open">Abrir menu de Navegacion</string>
  4846. -    <string name="navigation_drawer_close">Cerrar menu de navegacion</string>
  4847. -
  4848. -    <!-- TODO: Remove or change this placeholder text -->
  4849. -    <string name="hello_blank_fragment">Hola, seccion en blanco</string>
  4850. -
  4851. -    <string name="title_activity_sign_up_button">Resgistrarse </string>
  4852. -    <string name="sign_up_button">Iniciar Sesion</string>
  4853. -    <string name="dummy_content">Cartera de Bitshares</string>
  4854. -
  4855. -    <string name="splash_page_message">Almacenamiento y transacciones mas seguras</string>
  4856. -
  4857. -    <string name="about_activity_title">Acerca de</string>
  4858. -    <string name="settings_activity_title">Ajustes</string>
  4859. -    <string name="import_activity_title">Importar Llave</string>
  4860. -    <string name="model_select_activity_title">Iniciar Sesion</string>
  4861. -
  4862. -    <string name="operation_history_year">hace %d años</string>
  4863. -    <string name="operation_history_years">hace %d años</string>
  4864. -
  4865. -    <string name="operation_history_month">hace %d meses</string>
  4866. -    <string name="operation_history_months">hace %d meses</string>
  4867. -
  4868. -    <string name="operation_history_weeks">hace %d semanas</string>
  4869. -    <string name="operation_history_week">hace %d semanas</string>
  4870. -
  4871. -    <string name="operation_history_day">hace %d dias</string>
  4872. -    <string name="operation_history_days">hace %d dias</string>
  4873. -
  4874. -    <string name="operation_history_hours">hace %d horas</string>
  4875. -    <string name="operation_history_hour">hace %d horas</string>
  4876. -
  4877. -    <string name="operation_history_minte">hace %d minutos</string>
  4878. -    <string name="operation_history_mintes">hace %d minutos</string>
  4879. -
  4880. -    <string name="operation_history_seconds">hace %d segundos</string>
  4881. -    <string name="operation_history_second">hace %d segundos</string>
  4882. -
  4883. -    <string name="main_activity_loading">Cargando…</string>
  4884. -
  4885. -    <string name="import_activity_unknown_error">Ha ocurrido un error</string>
  4886. -    <string name="import_activity_private_key_invalid">Llave Privada Erronea</string>
  4887. -    <string name="import_activity_account_invalid">La cuenta no existe</string>
  4888. -    <string name="import_activity_account_not_match_key">La llave privada no encaja con el usuario</string>
  4889. -    <string name="import_activity_account_name_invalid">El usuario no existe</string>
  4890. -    <string name="import_activity_connect_failed">No ha sido posible conectarse al servidor</string>
  4891. -    <string name="import_activity_file_failed">No se ha podido leer el contenido del archivo </string>
  4892. -    <string name="import_activity_password_invalid">Contraseña Erronea</string>
  4893. -    <string name="import_activity_file_bin_password_invalid">Archivo de la Cartera o contraseña erronea</string>
  4894. -
  4895. -    <string name="password_confirm_title">Porfavor escriba la contraseña para confirmar la transaccion:</string>
  4896. -    <string name="password_confirm_button_confirm">CONFIRMAR</string>
  4897. -    <string name="password_confirm_button_cancel">CANCELAR</string>
  4898. -    <string name="password_invalid">CONTRASEÑA ERRONEA</string>
  4899. -
  4900. -    <string name="connect_fail_message"> Impossible conectarse a internet \nPorfavor reinténtalo despues de encender el Wifi o los Datos Moviles</string>
  4901. -    <string name="connect_fail_dialog_retry">Reintentar</string>
  4902. -
  4903. -    <string name="log_out_dialog_message">Seguro que desea cerrar la sesion?</string>
  4904. -    <string name="log_out_dialog_confirm_button">CERRAR SESION</string>
  4905. -    <string name="log_out_dialog_cancel_button">CANCELAR</string>
  4906. -
  4907. -    <string name="import_activity_wallet_model">Modelo de Cartera</string>
  4908. -    <string name="import_activity_account_model">Modelo de Cuenta</string>
  4909. -    <string name="title_activity_settings">Ajustes</string>
  4910. -
  4911. -    <string name="about_activity_text">Si te gusta la aplicacion, Apreciarimos recibir una donacion.</string>
  4912. -    <string name="about_activity_version">Version</string>
  4913. -    <string name="about_activity_button">DONAR</string>
  4914. -
  4915. -    <string name="send_account_to_hint">Escriba el Usuario</string>
  4916. -    <string name="send_memo_hint">Opcional</string>
  4917. -
  4918. -    <string name="transaction_memo_hint">Toque para desbloquaer el memorandum</string>
  4919. -    <string name="transaction_unlock_memo_dialog_message">escriba su contraseña para desbloquear:</string>
  4920. -
  4921. -    <string name="title_wallet">Cartera</string>
  4922. -    <string name="title_quotation">Precios</string>
  4923. -    <string name="title_exchange">Bolsa</string>
  4924. -    <string name="title_buy">Comprar</string>
  4925. -    <string name="title_sell">Vender</string>
  4926. -    <string name="title_my_orders">Ordenes Abiertas</string>
  4927. -
  4928. -    <string name="label_latest">Ultimo:</string>
  4929. -    <string name="label_high">Alto:</string>
  4930. -    <string name="label_low">Bajo:</string>
  4931. -    <string name="label_volume">Volumen:</string>
  4932. -    <string name="label_hour_24">24h</string>
  4933. -    <string name="label_price">Precio:</string>
  4934. -    <string name="label_quantity">Cantidad:</string>
  4935. -    <string name="label_total">Total:</string>
  4936. -    <string name="label_fee">Cuota:</string>
  4937. -    <string name="label_balance">Balance:</string>
  4938. -    <string name="label_lowest_ask">Compra mas baja:</string>
  4939. -    <string name="label_highest_bid">Venta mas alta:</string>
  4940. -
  4941. -    <string name="label_reset">RESETEAR</string>
  4942. -    <string name="label_buy">COMPRAR</string>
  4943. -    <string name="label_sell">VENDER</string>
  4944. -    <string name="label_buy_order">ORDEN DE COMPRA</string>
  4945. -    <string name="label_sell_order">ORDEN DE VENTA</string>
  4946. -    <string name="label_operation">Operacion:</string>
  4947. -    <string name="label_expiration">Vencimiento:</string>
  4948. -    <string name="label_no_open_orders">No tiene ordenes abiertas</string>
  4949. -    <string name="label_cancel_order">CANCELAR ORDEN</string>
  4950. -
  4951. -    <string name="label_please_confirm">POR FAVOR CONFIRMAR</string>
  4952. -    <string name="label_type_password">Escriba la contraseña para confirmar </string>
  4953. -    <string name="label_ok">OK</string>
  4954. -    <string name="label_no">NO</string>
  4955. -    <string name="text_price">Precio</string>
  4956. -    <string name="label_confirm_cancel_order">Esta seguro de que quiere cancelar la orden?</string>
  4957. -
  4958. -    <string name="menu_logout">Cerrar Sesion</string>
  4959. -    <string name="import_account_name">Usuario:</string>
  4960. -    <string name="import_password">Contraseña:</string>
  4961. -    <string name="label_memo">Memorandum:</string>
  4962. -    <string name="label_from">De:</string>
  4963. -    <string name="label_to">A:</string>
  4964. -
  4965. -    <string name="tab_send">Enviar</string>
  4966. -    <string name="tab_balances">Balances</string>
  4967. -    <string name="tab_transactions">Transacciones</string>
  4968. -    <string name="title_currency_settings">Ajustes de Moneda</string>
  4969. -    <string name="title_full_node_api_server_select">Nodo completo Seleccionar Servidor de API</string>
  4970. -    <string name="title_select_currency">Elegir Moneda</string>
  4971. -    <string name="title_select_api_server">Nodo completo Seleccionar Servidor de API</string>
  4972. -
  4973. -    <string name="label_file_path">camino de archivo:</string>
  4974. -    <string name="label_select_file">Seleccionar Archivo</string>
  4975. -    <string name="label_private_key">Llave privada:</string>
  4976. -    
  4977. -    <string name="label_bts_cny">bitCNY/BTS</string>
  4978. -    <string name="label_bts">BTS</string>
  4979. -    <string name="label_cny">bitCNY</string>
  4980. -</resources>
  4981. +<resources>
  4982. +    <string name="app_name_full">Cartera de Evraz</string>
  4983. +    <string name="app_name">Evraz Wallet</string>
  4984. +
  4985. +    <string name="navigation_drawer_open">Abrir menu de Navegacion</string>
  4986. +    <string name="navigation_drawer_close">Cerrar menu de navegacion</string>
  4987. +
  4988. +    <!-- TODO: Remove or change this placeholder text -->
  4989. +    <string name="hello_blank_fragment">Hola, seccion en blanco</string>
  4990. +
  4991. +    <string name="title_activity_sign_up_button">Resgistrarse </string>
  4992. +    <string name="sign_up_button">Iniciar Sesion</string>
  4993. +    <string name="dummy_content">Cartera de Evraz</string>
  4994. +
  4995. +    <string name="splash_page_message">Almacenamiento y transacciones mas seguras</string>
  4996. +
  4997. +    <string name="about_activity_title">Acerca de</string>
  4998. +    <string name="settings_activity_title">Ajustes</string>
  4999. +    <string name="import_activity_title">Importar Llave</string>
  5000. +    <string name="model_select_activity_title">Iniciar Sesion</string>
  5001. +
  5002. +    <string name="operation_history_year">hace %d años</string>
  5003. +    <string name="operation_history_years">hace %d años</string>
  5004. +
  5005. +    <string name="operation_history_month">hace %d meses</string>
  5006. +    <string name="operation_history_months">hace %d meses</string>
  5007. +
  5008. +    <string name="operation_history_weeks">hace %d semanas</string>
  5009. +    <string name="operation_history_week">hace %d semanas</string>
  5010. +
  5011. +    <string name="operation_history_day">hace %d dias</string>
  5012. +    <string name="operation_history_days">hace %d dias</string>
  5013. +
  5014. +    <string name="operation_history_hours">hace %d horas</string>
  5015. +    <string name="operation_history_hour">hace %d horas</string>
  5016. +
  5017. +    <string name="operation_history_minte">hace %d minutos</string>
  5018. +    <string name="operation_history_mintes">hace %d minutos</string>
  5019. +
  5020. +    <string name="operation_history_seconds">hace %d segundos</string>
  5021. +    <string name="operation_history_second">hace %d segundos</string>
  5022. +
  5023. +    <string name="main_activity_loading">Cargando…</string>
  5024. +
  5025. +    <string name="import_activity_unknown_error">Ha ocurrido un error</string>
  5026. +    <string name="import_activity_private_key_invalid">Llave Privada Erronea</string>
  5027. +    <string name="import_activity_account_invalid">La cuenta no existe</string>
  5028. +    <string name="import_activity_account_not_match_key">La llave privada no encaja con el usuario</string>
  5029. +    <string name="import_activity_account_name_invalid">El usuario no existe</string>
  5030. +    <string name="import_activity_connect_failed">No ha sido posible conectarse al servidor</string>
  5031. +    <string name="import_activity_file_failed">No se ha podido leer el contenido del archivo </string>
  5032. +    <string name="import_activity_password_invalid">Contraseña Erronea</string>
  5033. +    <string name="import_activity_file_bin_password_invalid">Archivo de la Cartera o contraseña erronea</string>
  5034. +
  5035. +    <string name="password_confirm_title">Porfavor escriba la contraseña para confirmar la transaccion:</string>
  5036. +    <string name="password_confirm_button_confirm">CONFIRMAR</string>
  5037. +    <string name="password_confirm_button_cancel">CANCELAR</string>
  5038. +    <string name="password_invalid">CONTRASEÑA ERRONEA</string>
  5039. +
  5040. +    <string name="connect_fail_message"> Impossible conectarse a internet \nPorfavor reinténtalo despues de encender el Wifi o los Datos Moviles</string>
  5041. +    <string name="connect_fail_dialog_retry">Reintentar</string>
  5042. +
  5043. +    <string name="log_out_dialog_message">Seguro que desea cerrar la sesion?</string>
  5044. +    <string name="log_out_dialog_confirm_button">CERRAR SESION</string>
  5045. +    <string name="log_out_dialog_cancel_button">CANCELAR</string>
  5046. +
  5047. +    <string name="import_activity_wallet_model">Modelo de Cartera</string>
  5048. +    <string name="import_activity_account_model">Modelo de Cuenta</string>
  5049. +    <string name="title_activity_settings">Ajustes</string>
  5050. +
  5051. +    <string name="about_activity_text">Si te gusta la aplicacion, Apreciarimos recibir una donacion.</string>
  5052. +    <string name="about_activity_version">Version</string>
  5053. +    <string name="about_activity_button">DONAR</string>
  5054. +
  5055. +    <string name="send_account_to_hint">Escriba el Usuario</string>
  5056. +    <string name="send_memo_hint">Opcional</string>
  5057. +
  5058. +    <string name="transaction_memo_hint">Toque para desbloquaer el memorandum</string>
  5059. +    <string name="transaction_unlock_memo_dialog_message">escriba su contraseña para desbloquear:</string>
  5060. +
  5061. +    <string name="title_wallet">Cartera</string>
  5062. +    <string name="title_quotation">Precios</string>
  5063. +    <string name="title_exchange">Bolsa</string>
  5064. +    <string name="title_buy">Comprar</string>
  5065. +    <string name="title_sell">Vender</string>
  5066. +    <string name="title_my_orders">Ordenes Abiertas</string>
  5067. +
  5068. +    <string name="label_latest">Ultimo:</string>
  5069. +    <string name="label_high">Alto:</string>
  5070. +    <string name="label_low">Bajo:</string>
  5071. +    <string name="label_volume">Volumen:</string>
  5072. +    <string name="label_hour_24">24h</string>
  5073. +    <string name="label_price">Precio:</string>
  5074. +    <string name="label_quantity">Cantidad:</string>
  5075. +    <string name="label_total">Total:</string>
  5076. +    <string name="label_fee">Cuota:</string>
  5077. +    <string name="label_balance">Balance:</string>
  5078. +    <string name="label_lowest_ask">Compra mas baja:</string>
  5079. +    <string name="label_highest_bid">Venta mas alta:</string>
  5080. +
  5081. +    <string name="label_reset">RESETEAR</string>
  5082. +    <string name="label_buy">COMPRAR</string>
  5083. +    <string name="label_sell">VENDER</string>
  5084. +    <string name="label_buy_order">ORDEN DE COMPRA</string>
  5085. +    <string name="label_sell_order">ORDEN DE VENTA</string>
  5086. +    <string name="label_operation">Operacion:</string>
  5087. +    <string name="label_expiration">Vencimiento:</string>
  5088. +    <string name="label_no_open_orders">No tiene ordenes abiertas</string>
  5089. +    <string name="label_cancel_order">CANCELAR ORDEN</string>
  5090. +
  5091. +    <string name="label_please_confirm">POR FAVOR CONFIRMAR</string>
  5092. +    <string name="label_type_password">Escriba la contraseña para confirmar </string>
  5093. +    <string name="label_ok">OK</string>
  5094. +    <string name="label_no">NO</string>
  5095. +    <string name="text_price">Precio</string>
  5096. +    <string name="label_confirm_cancel_order">Esta seguro de que quiere cancelar la orden?</string>
  5097. +
  5098. +    <string name="menu_logout">Cerrar Sesion</string>
  5099. +    <string name="import_account_name">Usuario:</string>
  5100. +    <string name="import_password">Contraseña:</string>
  5101. +    <string name="label_memo">Memorandum:</string>
  5102. +    <string name="label_from">De:</string>
  5103. +    <string name="label_to">A:</string>
  5104. +
  5105. +    <string name="tab_send">Enviar</string>
  5106. +    <string name="tab_balances">Balances</string>
  5107. +    <string name="tab_transactions">Transacciones</string>
  5108. +    <string name="title_currency_settings">Ajustes de Moneda</string>
  5109. +    <string name="title_full_node_api_server_select">Nodo completo Seleccionar Servidor de API</string>
  5110. +    <string name="title_select_currency">Elegir Moneda</string>
  5111. +    <string name="title_select_api_server">Nodo completo Seleccionar Servidor de API</string>
  5112. +
  5113. +    <string name="label_file_path">camino de archivo:</string>
  5114. +    <string name="label_select_file">Seleccionar Archivo</string>
  5115. +    <string name="label_private_key">Llave privada:</string>
  5116. +    
  5117. +    <string name="label_bts_cny">bitCNY/BTS</string>
  5118. +    <string name="label_bts">BTS</string>
  5119. +    <string name="label_cny">bitCNY</string>
  5120. +</resources>
  5121. diff --git a/bitshares_andriod_wallet/app/src/main/res/values-nl/strings.xml b/evraz-wallet/app/src/main/res/values-nl/strings.xml
  5122. index bbe895e..13cd57d 100644
  5123. --- a/bitshares_andriod_wallet/app/src/main/res/values-nl/strings.xml
  5124. +++ b/evraz-wallet/app/src/main/res/values-nl/strings.xml
  5125. @@ -1,141 +1,141 @@
  5126. -<resources>
  5127. -    <string name="app_name_full">Bitshares Portemonnee</string>
  5128. -    <string name="app_name">BTS Portemonnee</string>
  5129. -
  5130. -    <!--侧边栏-->
  5131. -    <string name="navigation_drawer_open">Open navigatie menu</string>
  5132. -    <string name="navigation_drawer_close">Sluit navigatie menu</string>
  5133. -
  5134. -    <!-- TODO: Remove or change this placeholder text -->
  5135. -    <string name="hello_blank_fragment">Hallo leeg fragment</string>
  5136. -
  5137. -    <string name="title_activity_sign_up_button">SignUpButtonActivity</string>
  5138. -    <string name="sign_up_button">LOG IN</string>
  5139. -    <string name="dummy_content">BitShares Portemonnee</string>
  5140. -
  5141. -    <string name="splash_page_message">Een veiligere manier van bewaren en transacties doen</string>
  5142. -
  5143. -    <string name="about_activity_title">Over</string>
  5144. -    <string name="settings_activity_title">Instellingen</string>
  5145. -    <string name="import_activity_title">Key importeren</string>
  5146. -    <string name="model_select_activity_title">Log In</string>
  5147. -
  5148. -    <string name="operation_history_year">%d jaar geleden</string>
  5149. -    <string name="operation_history_years">%d jaren geleden</string>
  5150. -
  5151. -    <string name="operation_history_month">%d maand geleden</string>
  5152. -    <string name="operation_history_months">%d maanden geleden</string>
  5153. -
  5154. -    <string name="operation_history_weeks">%d weken geleden</string>
  5155. -    <string name="operation_history_week">%d week geleden</string>
  5156. -
  5157. -    <string name="operation_history_day">%d dag geleden</string>
  5158. -    <string name="operation_history_days">%d dagen geleden</string>
  5159. -
  5160. -    <string name="operation_history_hours">%d uren geleden</string>
  5161. -    <string name="operation_history_hour">%d uur geleden</string>
  5162. -
  5163. -    <string name="operation_history_minte">%d minuut geleden</string>
  5164. -    <string name="operation_history_mintes">%d minuten geleden</string>
  5165. -
  5166. -    <string name="operation_history_seconds">%d seconden geleden</string>
  5167. -    <string name="operation_history_second">%d seconde geleden</string>
  5168. -
  5169. -    <string name="main_activity_loading">Loading…</string>
  5170. -
  5171. -    <string name="import_activity_unknown_error">Er deed zich een fout voor.</string>
  5172. -    <string name="import_activity_private_key_invalid">Ongeldige private key.</string>
  5173. -    <string name="import_activity_account_invalid">De account bestaat niet.</string>
  5174. -    <string name="import_activity_account_not_match_key">De account en private key komen niet overeen.</string>
  5175. -    <string name="import_activity_account_name_invalid">De account kan niet worden gevonden.</string>
  5176. -    <string name="import_activity_connect_failed">Geen verbinding met server.</string>
  5177. -    <string name="import_activity_file_failed">Kan het bestand niet lezen.</string>
  5178. -    <string name="import_activity_password_invalid">Ongeldig wachtwoord.</string>
  5179. -    <string name="import_activity_file_bin_password_invalid">Ongeldig wachtwoord of wallet bestand.</string>
  5180. -
  5181. -    <string name="password_confirm_title">Voer uw wachtwoord in om de transactie te bevestigen:</string>
  5182. -    <string name="password_confirm_button_confirm">BEVESTIGEN</string>
  5183. -    <string name="password_confirm_button_cancel">ANNULEREN</string>
  5184. -    <string name="password_invalid">Ongeldig wachtwoord.</string>
  5185. -
  5186. -    <string name="connect_fail_message">Geen internetverbinding. \nProbeer alstublieft opnieuw na het inschakelen van WIFI of mobiele data.</string>
  5187. -    <string name="connect_fail_dialog_retry">Opnieuw proberen</string>
  5188. -
  5189. -    <string name="log_out_dialog_message">Weet u zeker dat u uit wilt loggen?</string>
  5190. -    <string name="log_out_dialog_confirm_button">LOG UIT</string>
  5191. -    <string name="log_out_dialog_cancel_button">ANNULEREN</string>
  5192. -
  5193. -    <string name="import_activity_wallet_model">Wallet Model</string>
  5194. -    <string name="import_activity_account_model">Account Model</string>
  5195. -    <string name="title_activity_settings">Instellingen</string>
  5196. -
  5197. -    <string name="about_activity_text">Houd u van onze app? We waarderen een donatie enorm.</string>
  5198. -    <string name="about_activity_version">Versie</string>
  5199. -    <string name="about_activity_button">DONEER</string>
  5200. -
  5201. -    <string name="send_account_to_hint">Typ de account naam</string>
  5202. -    <string name="send_memo_hint">Optioneel</string>
  5203. -
  5204. -    <string name="transaction_memo_hint">Tik om de memo te ontgrendelen</string>
  5205. -    <string name="transaction_unlock_memo_dialog_message">Typ uw wachtwoord om te ontgrendelen</string>
  5206. -
  5207. -    <string name="title_wallet">Portemonnee</string>
  5208. -    <string name="title_quotation">Quotes</string>
  5209. -    <string name="title_exchange">Exchange</string>
  5210. -    <string name="title_buy">Kopen</string>
  5211. -    <string name="title_sell">Verkopen</string>
  5212. -    <string name="title_my_orders">Mijn open orders</string>
  5213. -
  5214. -    <string name="label_latest">Laatste:</string>
  5215. -    <string name="label_high">Hoog:</string>
  5216. -    <string name="label_low">Laag:</string>
  5217. -    <string name="label_volume">Vol:</string>
  5218. -    <string name="label_hour_24">24u</string>
  5219. -    <string name="label_price">Prijs:</string>
  5220. -    <string name="label_quantity">Hoeveelheid:</string>
  5221. -    <string name="label_total">Totaal:</string>
  5222. -    <string name="label_fee">Fee:</string>
  5223. -    <string name="label_balance">Saldo:</string>
  5224. -    <string name="label_lowest_ask">Laagste vraag:</string>
  5225. -    <string name="label_highest_bid">Hoogste bod:</string>
  5226. -
  5227. -    <string name="label_reset">RESET</string>
  5228. -    <string name="label_buy">KOOP</string>
  5229. -    <string name="label_sell">VERKOOP</string>
  5230. -    <string name="label_buy_order">KOOP ORDER</string>
  5231. -    <string name="label_sell_order">VERKOOP ORDER</string>
  5232. -    <string name="label_operation">Operation:</string>
  5233. -    <string name="label_expiration">Expiration:</string>
  5234. -    <string name="label_no_open_orders">U heeft op dit moment geen open orders</string>
  5235. -    <string name="label_cancel_order">ANNULEER ORDER</string>
  5236. -
  5237. -    <string name="label_please_confirm">Bevestig alstublieft</string>
  5238. -    <string name="label_type_password">Typ uw wachtwoord</string>
  5239. -    <string name="label_ok">OK</string>
  5240. -    <string name="label_no">NEE</string>
  5241. -    <string name="text_price">Prijs</string>
  5242. -    <string name="label_confirm_cancel_order">Weet u zeker dat u wilt annuleren?</string>
  5243. -
  5244. -    <string name="menu_logout">Log uit</string>
  5245. -    <string name="import_account_name">Account Naam:</string>
  5246. -    <string name="import_password">Wachtwoord:</string>
  5247. -    <string name="label_memo">Memo:</string>
  5248. -    <string name="label_from">Van:</string>
  5249. -    <string name="label_to">Naar:</string>
  5250. -
  5251. -    <string name="tab_send">Verzenden</string>
  5252. -    <string name="tab_balances">Saldi</string>
  5253. -    <string name="tab_transactions">Transacties</string>
  5254. -    <string name="title_currency_settings">Valuta instellingen</string>
  5255. -    <string name="title_full_node_api_server_select">Full Node Api Server Selecteren</string>
  5256. -    <string name="title_select_currency">Kies een valuta</string>
  5257. -    <string name="title_select_api_server">Kies een Full Node Api Server</string>
  5258. -
  5259. -    <string name="label_file_path">Bestandslocatie:</string>
  5260. -    <string name="label_select_file">Bestand Selecteren</string>
  5261. -    <string name="label_private_key">Private Key:</string>
  5262. -    
  5263. -    <string name="label_bts_cny">bitCNY/BTS</string>
  5264. -    <string name="label_bts">BTS</string>
  5265. -    <string name="label_cny">bitCNY</string>
  5266. -</resources>
  5267. +<resources>
  5268. +    <string name="app_name_full">Evraz Portemonnee</string>
  5269. +    <string name="app_name">Evraz Portemonnee</string>
  5270. +
  5271. +    <!--侧边栏-->
  5272. +    <string name="navigation_drawer_open">Open navigatie menu</string>
  5273. +    <string name="navigation_drawer_close">Sluit navigatie menu</string>
  5274. +
  5275. +    <!-- TODO: Remove or change this placeholder text -->
  5276. +    <string name="hello_blank_fragment">Hallo leeg fragment</string>
  5277. +
  5278. +    <string name="title_activity_sign_up_button">SignUpButtonActivity</string>
  5279. +    <string name="sign_up_button">LOG IN</string>
  5280. +    <string name="dummy_content">Evraz Portemonnee</string>
  5281. +
  5282. +    <string name="splash_page_message">Een veiligere manier van bewaren en transacties doen</string>
  5283. +
  5284. +    <string name="about_activity_title">Over</string>
  5285. +    <string name="settings_activity_title">Instellingen</string>
  5286. +    <string name="import_activity_title">Key importeren</string>
  5287. +    <string name="model_select_activity_title">Log In</string>
  5288. +
  5289. +    <string name="operation_history_year">%d jaar geleden</string>
  5290. +    <string name="operation_history_years">%d jaren geleden</string>
  5291. +
  5292. +    <string name="operation_history_month">%d maand geleden</string>
  5293. +    <string name="operation_history_months">%d maanden geleden</string>
  5294. +
  5295. +    <string name="operation_history_weeks">%d weken geleden</string>
  5296. +    <string name="operation_history_week">%d week geleden</string>
  5297. +
  5298. +    <string name="operation_history_day">%d dag geleden</string>
  5299. +    <string name="operation_history_days">%d dagen geleden</string>
  5300. +
  5301. +    <string name="operation_history_hours">%d uren geleden</string>
  5302. +    <string name="operation_history_hour">%d uur geleden</string>
  5303. +
  5304. +    <string name="operation_history_minte">%d minuut geleden</string>
  5305. +    <string name="operation_history_mintes">%d minuten geleden</string>
  5306. +
  5307. +    <string name="operation_history_seconds">%d seconden geleden</string>
  5308. +    <string name="operation_history_second">%d seconde geleden</string>
  5309. +
  5310. +    <string name="main_activity_loading">Loading…</string>
  5311. +
  5312. +    <string name="import_activity_unknown_error">Er deed zich een fout voor.</string>
  5313. +    <string name="import_activity_private_key_invalid">Ongeldige private key.</string>
  5314. +    <string name="import_activity_account_invalid">De account bestaat niet.</string>
  5315. +    <string name="import_activity_account_not_match_key">De account en private key komen niet overeen.</string>
  5316. +    <string name="import_activity_account_name_invalid">De account kan niet worden gevonden.</string>
  5317. +    <string name="import_activity_connect_failed">Geen verbinding met server.</string>
  5318. +    <string name="import_activity_file_failed">Kan het bestand niet lezen.</string>
  5319. +    <string name="import_activity_password_invalid">Ongeldig wachtwoord.</string>
  5320. +    <string name="import_activity_file_bin_password_invalid">Ongeldig wachtwoord of wallet bestand.</string>
  5321. +
  5322. +    <string name="password_confirm_title">Voer uw wachtwoord in om de transactie te bevestigen:</string>
  5323. +    <string name="password_confirm_button_confirm">BEVESTIGEN</string>
  5324. +    <string name="password_confirm_button_cancel">ANNULEREN</string>
  5325. +    <string name="password_invalid">Ongeldig wachtwoord.</string>
  5326. +
  5327. +    <string name="connect_fail_message">Geen internetverbinding. \nProbeer alstublieft opnieuw na het inschakelen van WIFI of mobiele data.</string>
  5328. +    <string name="connect_fail_dialog_retry">Opnieuw proberen</string>
  5329. +
  5330. +    <string name="log_out_dialog_message">Weet u zeker dat u uit wilt loggen?</string>
  5331. +    <string name="log_out_dialog_confirm_button">LOG UIT</string>
  5332. +    <string name="log_out_dialog_cancel_button">ANNULEREN</string>
  5333. +
  5334. +    <string name="import_activity_wallet_model">Wallet Model</string>
  5335. +    <string name="import_activity_account_model">Account Model</string>
  5336. +    <string name="title_activity_settings">Instellingen</string>
  5337. +
  5338. +    <string name="about_activity_text">Houd u van onze app? We waarderen een donatie enorm.</string>
  5339. +    <string name="about_activity_version">Versie</string>
  5340. +    <string name="about_activity_button">DONEER</string>
  5341. +
  5342. +    <string name="send_account_to_hint">Typ de account naam</string>
  5343. +    <string name="send_memo_hint">Optioneel</string>
  5344. +
  5345. +    <string name="transaction_memo_hint">Tik om de memo te ontgrendelen</string>
  5346. +    <string name="transaction_unlock_memo_dialog_message">Typ uw wachtwoord om te ontgrendelen</string>
  5347. +
  5348. +    <string name="title_wallet">Portemonnee</string>
  5349. +    <string name="title_quotation">Quotes</string>
  5350. +    <string name="title_exchange">Exchange</string>
  5351. +    <string name="title_buy">Kopen</string>
  5352. +    <string name="title_sell">Verkopen</string>
  5353. +    <string name="title_my_orders">Mijn open orders</string>
  5354. +
  5355. +    <string name="label_latest">Laatste:</string>
  5356. +    <string name="label_high">Hoog:</string>
  5357. +    <string name="label_low">Laag:</string>
  5358. +    <string name="label_volume">Vol:</string>
  5359. +    <string name="label_hour_24">24u</string>
  5360. +    <string name="label_price">Prijs:</string>
  5361. +    <string name="label_quantity">Hoeveelheid:</string>
  5362. +    <string name="label_total">Totaal:</string>
  5363. +    <string name="label_fee">Fee:</string>
  5364. +    <string name="label_balance">Saldo:</string>
  5365. +    <string name="label_lowest_ask">Laagste vraag:</string>
  5366. +    <string name="label_highest_bid">Hoogste bod:</string>
  5367. +
  5368. +    <string name="label_reset">RESET</string>
  5369. +    <string name="label_buy">KOOP</string>
  5370. +    <string name="label_sell">VERKOOP</string>
  5371. +    <string name="label_buy_order">KOOP ORDER</string>
  5372. +    <string name="label_sell_order">VERKOOP ORDER</string>
  5373. +    <string name="label_operation">Operation:</string>
  5374. +    <string name="label_expiration">Expiration:</string>
  5375. +    <string name="label_no_open_orders">U heeft op dit moment geen open orders</string>
  5376. +    <string name="label_cancel_order">ANNULEER ORDER</string>
  5377. +
  5378. +    <string name="label_please_confirm">Bevestig alstublieft</string>
  5379. +    <string name="label_type_password">Typ uw wachtwoord</string>
  5380. +    <string name="label_ok">OK</string>
  5381. +    <string name="label_no">NEE</string>
  5382. +    <string name="text_price">Prijs</string>
  5383. +    <string name="label_confirm_cancel_order">Weet u zeker dat u wilt annuleren?</string>
  5384. +
  5385. +    <string name="menu_logout">Log uit</string>
  5386. +    <string name="import_account_name">Account Naam:</string>
  5387. +    <string name="import_password">Wachtwoord:</string>
  5388. +    <string name="label_memo">Memo:</string>
  5389. +    <string name="label_from">Van:</string>
  5390. +    <string name="label_to">Naar:</string>
  5391. +
  5392. +    <string name="tab_send">Verzenden</string>
  5393. +    <string name="tab_balances">Saldi</string>
  5394. +    <string name="tab_transactions">Transacties</string>
  5395. +    <string name="title_currency_settings">Valuta instellingen</string>
  5396. +    <string name="title_full_node_api_server_select">Full Node Api Server Selecteren</string>
  5397. +    <string name="title_select_currency">Kies een valuta</string>
  5398. +    <string name="title_select_api_server">Kies een Full Node Api Server</string>
  5399. +
  5400. +    <string name="label_file_path">Bestandslocatie:</string>
  5401. +    <string name="label_select_file">Bestand Selecteren</string>
  5402. +    <string name="label_private_key">Private Key:</string>
  5403. +    
  5404. +    <string name="label_bts_cny">bitCNY/BTS</string>
  5405. +    <string name="label_bts">BTS</string>
  5406. +    <string name="label_cny">bitCNY</string>
  5407. +</resources>
  5408. diff --git a/bitshares_andriod_wallet/app/src/main/res/values-ru/strings.xml b/evraz-wallet/app/src/main/res/values-ru/strings.xml
  5409. index 4405bec..374fef1 100644
  5410. --- a/bitshares_andriod_wallet/app/src/main/res/values-ru/strings.xml
  5411. +++ b/evraz-wallet/app/src/main/res/values-ru/strings.xml
  5412. @@ -1,7 +1,62 @@
  5413.  <resources>
  5414. -    <string name="app_name_full">Bitshares Кошелек</string>
  5415. -    <string name="app_name">BTS Кошелек</string>
  5416. -
  5417. +    <string name="app_name_full">Evraz Кошелек</string>
  5418. +    <string name="app_name">Evraz Кошелек</string>
  5419. +    <!--new-->
  5420. +
  5421. +    <string name="back">Назад</string>
  5422. +    <string name="registration">Регистрация</string>
  5423. +    <string name="auth">Авторизация</string>
  5424. +    <string name="wallet">Wallet</string>
  5425. +    <string name="login_description">Вход в приложение осуществляется только по Модели Аккаунта (Account model)</string>
  5426. +    <string name="app_description">Данное мобильное приложение позволяет зарегистрироваться  по Модели Аккаунта (Account Model). Модель Аккаунта дает возможность управлять счетом с любого места, используя только пароль, и не требует загрузки .bin файла.
  5427. +
  5428. +\n\nКлючи для Аккаунта будут получены с использованием созданного Вами пароля. Они не будут храниться в браузере или на центральном сервере, поэтому необходимо убедиться, что Вы запомнили свой пароль.
  5429. +
  5430. +\n\nВведите желаемое имя аккаунта. Это имя будет публично зарегистрировано в блокчейне и являться идентификатором для любой Вашей транзакции.
  5431. +
  5432. +\n\nИмя должно содержать прописные буквы, цифры и тире "-", и быть более шести знаков.</string>
  5433. +    <string name="continue_registration">Продолжить регистрацию</string>
  5434. +    <string name="account_name">Имя аккаунта</string>
  5435. +    <string name="create_password">Создайте пароль</string>
  5436. +    <string name="confirm_password">Подтвердите пароль</string>
  5437. +    <string name="reg_checkbox_1">Я понимаю, что потеряю доступ к своим средствам, если потеряю свой пароль </string>
  5438. +    <string name="reg_checkbox_2">Я понимаю, что никто не может восстановить мой пароль, если я потеряю или забуду его</string>
  5439. +    <string name="reg_checkbox_3">Я записал или иным образом сохранил мой пароль</string>
  5440. +    <!--<string name="sign_up">Зарегистрироваться</string>-->
  5441. +    <string name="balance">Баланс</string>
  5442. +    <string name="send">Отправить</string>
  5443. +    <string name="exchange">Биржа</string>
  5444. +    <string name="exchange_title">Мои рынки</string>
  5445. +    <!--<string name="sum_usd">(%d USD)</string>-->
  5446. +    <string name="portfolio">Портфель</string>
  5447. +    <string name="open_orders">Открытые ордера</string>
  5448. +    <string name="position_provision">Обеспечение позиций</string>
  5449. +    <string name="transactions">Транзакции</string>
  5450. +    <string name="total_usd">Всего: %d %s</string>
  5451. +    <string name="assets">Актив</string>
  5452. +    <string name="short_count">Кол-во</string>
  5453. +    <string name="usd_rate">Курс (%s)</string>
  5454. +    <string name="usd_cost">Стоимость (%s)</string>
  5455. +    <string name="description">Описание</string>
  5456. +    <string name="price">Цена</string>
  5457. +    <!--<string name="market_price">Рыноч.цена</string>-->
  5458. +    <string name="from">От</string>
  5459. +    <string name="to">Кому</string>
  5460. +    <string name="count">Количество</string>
  5461. +    <string name="note">Заметка</string>
  5462. +    <string name="comission">Комиссия</string>
  5463. +    <string name="undo">Отменить</string>
  5464. +    <string name="my_markets">Мои рынки</string>
  5465. +    <string name="trading_schedule">График торгов</string>
  5466. +    <string name="buy">Купить</string>
  5467. +    <string name="sell">Продать</string>
  5468. +    <string name="orders">Ордера</string>
  5469. +    <string name="my_orders">Мои ордера</string>
  5470. +    <string name="cancel">Отмена</string>
  5471. +    <string name="buy_string">%s %s за %s</string>
  5472. +
  5473. +    <string name="orders_to_buy">Ордера на покупку</string>
  5474. +    <string name="orders_to_sell">Ордера на продажу</string>
  5475.      <!--侧边栏-->
  5476.      <string name="navigation_drawer_open">Открыть панель навигации</string>
  5477.      <string name="navigation_drawer_close">Закрыть панель навигации</string>
  5478. @@ -11,7 +66,7 @@
  5479.  
  5480.      <string name="title_activity_sign_up_button">Кнопка регистрации</string>
  5481.      <string name="sign_up_button">Зарегистрироваться</string>
  5482. -    <string name="dummy_content">BitShares Кошелек</string>
  5483. +    <string name="dummy_content">Evraz Кошелек</string>
  5484.  
  5485.      <string name="splash_page_message">Безопасный способ хранения и торговли</string>
  5486.  
  5487. @@ -69,7 +124,7 @@
  5488.      <string name="import_activity_account_model">Модель Аккаунта</string>
  5489.      <string name="title_activity_settings">Настройки</string>
  5490.  
  5491. -    <string name="about_activity_text">Если вам понравилась наше приложение, мы будем рады получить пожертвование.</string>
  5492. +    <string name="about_activity_text">EVRAZ Wallet является мобильным приложением для Android и предназначен для использования на криптовалютной платформе Bitshares.</string>
  5493.      <string name="about_activity_version">Версия</string>
  5494.      <string name="about_activity_button">ПОЖЕРТВОВАТЬ</string>
  5495.  
  5496. @@ -128,7 +183,7 @@
  5497.      <string name="tab_transactions">Транзакция</string>
  5498.      <string name="title_currency_settings">Настройки валюты</string>
  5499.      <string name="title_full_node_api_server_select">Выбор API-сервера</string>
  5500. -    <string name="title_select_currency">Выберите пару</string>
  5501. +    <string name="title_select_currency">Выберите валюту</string>
  5502.      <string name="title_select_api_server">Выберите API-сервер</string>
  5503.  
  5504.      <string name="label_file_path">Путь к файлу:</string>
  5505. diff --git a/bitshares_andriod_wallet/app/src/main/res/values-v21/styles.xml b/evraz-wallet/app/src/main/res/values-v21/styles.xml
  5506. index deab2df..78c1c1a 100644
  5507. --- a/bitshares_andriod_wallet/app/src/main/res/values-v21/styles.xml
  5508. +++ b/evraz-wallet/app/src/main/res/values-v21/styles.xml
  5509. @@ -1,16 +1,23 @@
  5510.  <resources>
  5511.  
  5512.      <!-- Base application theme. -->
  5513. -    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
  5514. +    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
  5515.          <!-- Customize your theme here. -->
  5516.          <item name="android:windowBackground">@color/background_color</item>
  5517.          <item name="colorPrimary">@color/colorPrimary</item>
  5518.          <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
  5519. -        <item name="colorAccent">@color/blue</item>
  5520. +        <item name="colorAccent">@color/colorAccent</item>
  5521.          <item name="windowActionBar">false</item>
  5522.          <item name="windowNoTitle">true</item>
  5523.          <item name="preferenceTheme">@style/myPreferenceTheme</item>
  5524.          <item name="android:statusBarColor">@color/background_color</item>
  5525. +
  5526. +        <!--<item name="android:alertDialogStyle">@style/MyOpaqueAlertDialog</item>-->
  5527.      </style>
  5528.  
  5529. +<!--    <style name="MyOpaqueAlertDialog" parent="@android:style/Theme.Dialog.Alert">
  5530. +        <item name="android:background">#454545</item>
  5531. +        <item name="android:windowBackground">#454545</item>
  5532. +        <item name="android:popupBackground">#454545</item>
  5533. +    </style>-->
  5534.  </resources>
  5535. diff --git a/bitshares_andriod_wallet/app/src/main/res/values-zh/strings.xml b/evraz-wallet/app/src/main/res/values-zh/strings.xml
  5536. index 69a4f06..4bd1f8f 100644
  5537. --- a/bitshares_andriod_wallet/app/src/main/res/values-zh/strings.xml
  5538. +++ b/evraz-wallet/app/src/main/res/values-zh/strings.xml
  5539. @@ -69,7 +69,7 @@
  5540.      <string name="import_activity_account_model">账号模式</string>
  5541.      <string name="title_activity_settings">设置</string>
  5542.  
  5543. -    <string name="about_activity_text">如果你喜欢我们的App，可以给我们打赏一点哦</string>
  5544. +    <string name="about_activity_text"></string>
  5545.      <string name="about_activity_version">版本</string>
  5546.      <string name="about_activity_button">打赏</string>
  5547.  
  5548. diff --git a/bitshares_andriod_wallet/app/src/main/res/xml/preferences.xml b/evraz-wallet/app/src/main/res/xml/preferences.xml
  5549. index fe2cf65..81bb91d 100644
  5550. --- a/bitshares_andriod_wallet/app/src/main/res/xml/preferences.xml
  5551. +++ b/evraz-wallet/app/src/main/res/xml/preferences.xml
  5552. @@ -1,15 +1,16 @@
  5553.  <?xml version="1.0" encoding="utf-8"?>
  5554.  <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
  5555.  
  5556. -    <ListPreference
  5557. +    <android.support.v7.preference.ListPreference
  5558.          android:key="currency_setting"
  5559.          android:title="@string/title_currency_settings"
  5560.          android:dialogTitle="@string/title_select_currency"
  5561.          android:entries="@array/bts_currency_unit_options"
  5562.          android:entryValues="@array/bts_currency_unit_values"
  5563. +
  5564.          android:defaultValue="USD"/>
  5565.  
  5566. -    <ListPreference
  5567. +    <android.support.v7.preference.ListPreference
  5568.          android:key="full_node_api_server"
  5569.          android:title="@string/title_full_node_api_server_select"
  5570.          android:dialogTitle="@string/title_select_api_server"
  5571. @@ -17,7 +18,7 @@
  5572.          android:entryValues="@array/full_node_api_server_values"
  5573.          android:defaultValue="autoselect"/>
  5574.  
  5575. -    <ListPreference
  5576. +    <android.support.v7.preference.ListPreference
  5577.          android:key="quotation_currency_pair"
  5578.          android:title="@string/quotation_cureency_select_title"
  5579.          android:dialogTitle="@string/quotation_cureency_select_dialog_title"
  5580. diff --git a/bitshares_andriod_wallet/build.gradle b/evraz-wallet/build.gradle
  5581. index 857630f..e59bac6 100644
  5582. --- a/bitshares_andriod_wallet/build.gradle
  5583. +++ b/evraz-wallet/build.gradle
  5584. @@ -6,7 +6,7 @@ buildscript {
  5585.          google()
  5586.      }
  5587.      dependencies {
  5588. -        classpath 'com.android.tools.build:gradle:3.0.0'
  5589. +        classpath 'com.android.tools.build:gradle:3.1.3'
  5590.  
  5591.          // NOTE: Do not place your application dependencies here; they belong
  5592.          // in the individual module build.gradle files
  5593. diff --git a/bitshares_andriod_wallet/gradle/wrapper/gradle-wrapper.properties b/evraz-wallet/gradle/wrapper/gradle-wrapper.properties
  5594. index cea734b..37ea583 100644
  5595. --- a/bitshares_andriod_wallet/gradle/wrapper/gradle-wrapper.properties
  5596. +++ b/evraz-wallet/gradle/wrapper/gradle-wrapper.properties
  5597. @@ -1,6 +1,6 @@
  5598. -#Thu Oct 19 14:04:29 CST 2017
  5599. +#Mon Aug 06 06:56:58 MSK 2018
  5600.  distributionBase=GRADLE_USER_HOME
  5601.  distributionPath=wrapper/dists
  5602.  zipStoreBase=GRADLE_USER_HOME
  5603.  zipStorePath=wrapper/dists
  5604. -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
  5605. +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
  5606. diff --git a/bitshares_andriod_wallet/gradlew.bat b/evraz-wallet/gradlew.bat
  5607. index aec9973..8a0b282 100644
  5608. --- a/bitshares_andriod_wallet/gradlew.bat
  5609. +++ b/evraz-wallet/gradlew.bat
  5610. @@ -1,90 +1,90 @@
  5611. -@if "%DEBUG%" == "" @echo off
  5612. -@rem ##########################################################################
  5613. -@rem
  5614. -@rem  Gradle startup script for Windows
  5615. -@rem
  5616. -@rem ##########################################################################
  5617. -
  5618. -@rem Set local scope for the variables with windows NT shell
  5619. -if "%OS%"=="Windows_NT" setlocal
  5620. -
  5621. -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
  5622. -set DEFAULT_JVM_OPTS=
  5623. -
  5624. -set DIRNAME=%~dp0
  5625. -if "%DIRNAME%" == "" set DIRNAME=.
  5626. -set APP_BASE_NAME=%~n0
  5627. -set APP_HOME=%DIRNAME%
  5628. -
  5629. -@rem Find java.exe
  5630. -if defined JAVA_HOME goto findJavaFromJavaHome
  5631. -
  5632. -set JAVA_EXE=java.exe
  5633. -%JAVA_EXE% -version >NUL 2>&1
  5634. -if "%ERRORLEVEL%" == "0" goto init
  5635. -
  5636. -echo.
  5637. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
  5638. -echo.
  5639. -echo Please set the JAVA_HOME variable in your environment to match the
  5640. -echo location of your Java installation.
  5641. -
  5642. -goto fail
  5643. -
  5644. -:findJavaFromJavaHome
  5645. -set JAVA_HOME=%JAVA_HOME:"=%
  5646. -set JAVA_EXE=%JAVA_HOME%/bin/java.exe
  5647. -
  5648. -if exist "%JAVA_EXE%" goto init
  5649. -
  5650. -echo.
  5651. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
  5652. -echo.
  5653. -echo Please set the JAVA_HOME variable in your environment to match the
  5654. -echo location of your Java installation.
  5655. -
  5656. -goto fail
  5657. -
  5658. -:init
  5659. -@rem Get command-line arguments, handling Windowz variants
  5660. -
  5661. -if not "%OS%" == "Windows_NT" goto win9xME_args
  5662. -if "%@eval[2+2]" == "4" goto 4NT_args
  5663. -
  5664. -:win9xME_args
  5665. -@rem Slurp the command line arguments.
  5666. -set CMD_LINE_ARGS=
  5667. -set _SKIP=2
  5668. -
  5669. -:win9xME_args_slurp
  5670. -if "x%~1" == "x" goto execute
  5671. -
  5672. -set CMD_LINE_ARGS=%*
  5673. -goto execute
  5674. -
  5675. -:4NT_args
  5676. -@rem Get arguments from the 4NT Shell from JP Software
  5677. -set CMD_LINE_ARGS=%$
  5678. -
  5679. -:execute
  5680. -@rem Setup the command line
  5681. -
  5682. -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
  5683. -
  5684. -@rem Execute Gradle
  5685. -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
  5686. -
  5687. -:end
  5688. -@rem End local scope for the variables with windows NT shell
  5689. -if "%ERRORLEVEL%"=="0" goto mainEnd
  5690. -
  5691. -:fail
  5692. -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
  5693. -rem the _cmd.exe /c_ return code!
  5694. -if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
  5695. -exit /b 1
  5696. -
  5697. -:mainEnd
  5698. -if "%OS%"=="Windows_NT" endlocal
  5699. -
  5700. -:omega
  5701. +@if "%DEBUG%" == "" @echo off
  5702. +@rem ##########################################################################
  5703. +@rem
  5704. +@rem  Gradle startup script for Windows
  5705. +@rem
  5706. +@rem ##########################################################################
  5707. +
  5708. +@rem Set local scope for the variables with windows NT shell
  5709. +if "%OS%"=="Windows_NT" setlocal
  5710. +
  5711. +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
  5712. +set DEFAULT_JVM_OPTS=
  5713. +
  5714. +set DIRNAME=%~dp0
  5715. +if "%DIRNAME%" == "" set DIRNAME=.
  5716. +set APP_BASE_NAME=%~n0
  5717. +set APP_HOME=%DIRNAME%
  5718. +
  5719. +@rem Find java.exe
  5720. +if defined JAVA_HOME goto findJavaFromJavaHome
  5721. +
  5722. +set JAVA_EXE=java.exe
  5723. +%JAVA_EXE% -version >NUL 2>&1
  5724. +if "%ERRORLEVEL%" == "0" goto init
  5725. +
  5726. +echo.
  5727. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
  5728. +echo.
  5729. +echo Please set the JAVA_HOME variable in your environment to match the
  5730. +echo location of your Java installation.
  5731. +
  5732. +goto fail
  5733. +
  5734. +:findJavaFromJavaHome
  5735. +set JAVA_HOME=%JAVA_HOME:"=%
  5736. +set JAVA_EXE=%JAVA_HOME%/bin/java.exe
  5737. +
  5738. +if exist "%JAVA_EXE%" goto init
  5739. +
  5740. +echo.
  5741. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
  5742. +echo.
  5743. +echo Please set the JAVA_HOME variable in your environment to match the
  5744. +echo location of your Java installation.
  5745. +
  5746. +goto fail
  5747. +
  5748. +:init
  5749. +@rem Get command-line arguments, handling Windowz variants
  5750. +
  5751. +if not "%OS%" == "Windows_NT" goto win9xME_args
  5752. +if "%@eval[2+2]" == "4" goto 4NT_args
  5753. +
  5754. +:win9xME_args
  5755. +@rem Slurp the command line arguments.
  5756. +set CMD_LINE_ARGS=
  5757. +set _SKIP=2
  5758. +
  5759. +:win9xME_args_slurp
  5760. +if "x%~1" == "x" goto execute
  5761. +
  5762. +set CMD_LINE_ARGS=%*
  5763. +goto execute
  5764. +
  5765. +:4NT_args
  5766. +@rem Get arguments from the 4NT Shell from JP Software
  5767. +set CMD_LINE_ARGS=%$
  5768. +
  5769. +:execute
  5770. +@rem Setup the command line
  5771. +
  5772. +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
  5773. +
  5774. +@rem Execute Gradle
  5775. +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
  5776. +
  5777. +:end
  5778. +@rem End local scope for the variables with windows NT shell
  5779. +if "%ERRORLEVEL%"=="0" goto mainEnd
  5780. +
  5781. +:fail
  5782. +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
  5783. +rem the _cmd.exe /c_ return code!
  5784. +if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
  5785. +exit /b 1
  5786. +
  5787. +:mainEnd
  5788. +if "%OS%"=="Windows_NT" endlocal
  5789. +
  5790. +:omega
  5791. diff --git a/evraz-wallet/graphenej/.gitattributes b/evraz-wallet/graphenej/.gitattributes
  5792. new file mode 100644
  5793. index 0000000..6ac0bc4
  5794. --- /dev/null
  5795. +++ b/evraz-wallet/graphenej/.gitattributes
  5796. @@ -0,0 +1,9 @@
  5797. +# Set the default behavior, in case people don't have core.autocrlf set.
  5798. +* text=auto
  5799. +
  5800. +# Declare files that will always have LF line endings on checkout.
  5801. +*.java text eol=lf
  5802. +
  5803. +# Denote all files that are truly binary and should not be modified.
  5804. +*.png binary
  5805. +*.jpg binary
  5806. diff --git a/evraz-wallet/graphenej/.gitignore b/evraz-wallet/graphenej/.gitignore
  5807. new file mode 100644
  5808. index 0000000..0790958
  5809. --- /dev/null
  5810. +++ b/evraz-wallet/graphenej/.gitignore
  5811. @@ -0,0 +1,105 @@
  5812. +# Java compilation
  5813. +*.class
  5814. +
  5815. +# Mac OS X file
  5816. +.DS_Store
  5817. +
  5818. +# Gradle
  5819. +# ------
  5820. +.gradle
  5821. +gradlew.bat
  5822. +gradle
  5823. +graphenej/build
  5824. +/build
  5825. +/buildSrc/build
  5826. +/subprojects/*/build
  5827. +/subprojects/docs/src/samples/*/*/build
  5828. +/subprojects/internal-android-performance-testing/build-android-libs
  5829. +
  5830. +# IDEA
  5831. +# ----
  5832. +.idea
  5833. +.shelf
  5834. +*.iml
  5835. +*.ipr
  5836. +*.iws
  5837. +/buildSrc/*.iml
  5838. +/buildSrc/*.ipr
  5839. +/buildSrc/*.iws
  5840. +/buildSrc/out
  5841. +/out
  5842. +/subprojects/*/*.iml
  5843. +/subprojects/*/out
  5844. +
  5845. +# Eclipse
  5846. +# -------
  5847. +*.classpath
  5848. +*.project
  5849. +*.settings
  5850. +/bin
  5851. +/subprojects/*/bin
  5852. +atlassian-ide-plugin.xml
  5853. +
  5854. +# NetBeans
  5855. +# --------
  5856. +.nb-gradle
  5857. +.nb-gradle-properties
  5858. +
  5859. +# Vim
  5860. +# ---
  5861. +*.sw[op]
  5862. +
  5863. +# Emacs
  5864. +# -----
  5865. +*~
  5866. +
  5867. +# Textmate
  5868. +# --------
  5869. +.textmate
  5870. +
  5871. +# Sublime Text
  5872. +# ------------
  5873. +*.sublime-*
  5874. +
  5875. +# jEnv
  5876. +# ----
  5877. +.java-version
  5878. +
  5879. +# OS X
  5880. +# ----
  5881. +.DS_Store
  5882. +
  5883. +# HPROF
  5884. +# -----
  5885. +*.hprof
  5886. +
  5887. +# Work dirs
  5888. +# ---------
  5889. +/incoming-distributions
  5890. +/intTestHomeDir
  5891. +
  5892. +# Logs
  5893. +# ----
  5894. +/*.log
  5895. +
  5896. +# Ignore bin backups
  5897. +*.bin
  5898. +
  5899. +# [Maven]
  5900. +# -------
  5901. +target/
  5902. +pom.xml.tag
  5903. +pom.xml.releaseBackup
  5904. +pom.xml.versionsBackup
  5905. +pom.xml.next
  5906. +release.properties
  5907. +
  5908. +# Package Files #
  5909. +*.jar
  5910. +*.war
  5911. +*.ear
  5912. +
  5913. +# Build dir
  5914. +graphenej/build
  5915. +
  5916. +local.properties
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!