Skip to content

Commit a91029c

Browse files
WooKeyWalletWooKeyWallet
committed
Optimize UX
1 parent 7014dfc commit a91029c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1305
-212
lines changed

‎app/build.gradle‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ apply plugin: 'kotlin-android-extensions'
44
apply plugin: 'kotlin-kapt'
55

66
def computeVersionCode() {
7-
80
7+
def cmd = 'git rev-list HEAD --first-parent --count'
8+
def trim = cmd.execute().text.trim()
9+
if (trim == null || trim.length() == 0) {
10+
trim = 1
11+
}
12+
trim.toInteger()
13+
103
814
}
915

1016
def gitVersionTag() {
@@ -24,7 +30,7 @@ def gitVersionTag() {
2430
}
2531

2632
def computeVersionName() {
27-
return "1.0.2"
33+
return "1.0.3"
2834
}
2935

3036
android {
@@ -37,6 +43,13 @@ android {
3743
versionName computeVersionName()
3844
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3945

46+
javaCompileOptions {
47+
annotationProcessorOptions {
48+
arguments = ["room.schemaLocation":
49+
"$projectDir/schemas".toString()]
50+
}
51+
}
52+
4053
}
4154
buildTypes {
4255
debug {

‎app/schemas/io.wookey.wallet.data.AppDatabase/1.json‎

Lines changed: 236 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,236 @@
1+
{
2+
"formatVersion": 1,
3+
"database": {
4+
"version": 1,
5+
"identityHash": "4501b5285edaa545e5ab39a9b659387e",
6+
"entities": [
7+
{
8+
"tableName": "wallets",
9+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `symbol` TEXT NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `balance` TEXT NOT NULL, `passwordPrompt` TEXT NOT NULL, `restoreHeight` INTEGER NOT NULL, `isActive` INTEGER NOT NULL)",
10+
"fields": [
11+
{
12+
"fieldPath": "id",
13+
"columnName": "_id",
14+
"affinity": "INTEGER",
15+
"notNull": true
16+
},
17+
{
18+
"fieldPath": "symbol",
19+
"columnName": "symbol",
20+
"affinity": "TEXT",
21+
"notNull": true
22+
},
23+
{
24+
"fieldPath": "name",
25+
"columnName": "name",
26+
"affinity": "TEXT",
27+
"notNull": true
28+
},
29+
{
30+
"fieldPath": "address",
31+
"columnName": "address",
32+
"affinity": "TEXT",
33+
"notNull": true
34+
},
35+
{
36+
"fieldPath": "balance",
37+
"columnName": "balance",
38+
"affinity": "TEXT",
39+
"notNull": true
40+
},
41+
{
42+
"fieldPath": "passwordPrompt",
43+
"columnName": "passwordPrompt",
44+
"affinity": "TEXT",
45+
"notNull": true
46+
},
47+
{
48+
"fieldPath": "restoreHeight",
49+
"columnName": "restoreHeight",
50+
"affinity": "INTEGER",
51+
"notNull": true
52+
},
53+
{
54+
"fieldPath": "isActive",
55+
"columnName": "isActive",
56+
"affinity": "INTEGER",
57+
"notNull": true
58+
}
59+
],
60+
"primaryKey": {
61+
"columnNames": [
62+
"_id"
63+
],
64+
"autoGenerate": true
65+
},
66+
"indices": [
67+
{
68+
"name": "index_wallets_symbol_name",
69+
"unique": true,
70+
"columnNames": [
71+
"symbol",
72+
"name"
73+
],
74+
"createSql": "CREATE UNIQUE INDEX `index_wallets_symbol_name` ON `${TABLE_NAME}` (`symbol`, `name`)"
75+
}
76+
],
77+
"foreignKeys": []
78+
},
79+
{
80+
"tableName": "assets",
81+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `walletId` INTEGER NOT NULL, `token` TEXT NOT NULL, `balance` TEXT NOT NULL, `contractAddress` TEXT NOT NULL)",
82+
"fields": [
83+
{
84+
"fieldPath": "id",
85+
"columnName": "_id",
86+
"affinity": "INTEGER",
87+
"notNull": true
88+
},
89+
{
90+
"fieldPath": "walletId",
91+
"columnName": "walletId",
92+
"affinity": "INTEGER",
93+
"notNull": true
94+
},
95+
{
96+
"fieldPath": "token",
97+
"columnName": "token",
98+
"affinity": "TEXT",
99+
"notNull": true
100+
},
101+
{
102+
"fieldPath": "balance",
103+
"columnName": "balance",
104+
"affinity": "TEXT",
105+
"notNull": true
106+
},
107+
{
108+
"fieldPath": "contractAddress",
109+
"columnName": "contractAddress",
110+
"affinity": "TEXT",
111+
"notNull": true
112+
}
113+
],
114+
"primaryKey": {
115+
"columnNames": [
116+
"_id"
117+
],
118+
"autoGenerate": true
119+
},
120+
"indices": [
121+
{
122+
"name": "index_assets_walletId_contractAddress",
123+
"unique": true,
124+
"columnNames": [
125+
"walletId",
126+
"contractAddress"
127+
],
128+
"createSql": "CREATE UNIQUE INDEX `index_assets_walletId_contractAddress` ON `${TABLE_NAME}` (`walletId`, `contractAddress`)"
129+
}
130+
],
131+
"foreignKeys": []
132+
},
133+
{
134+
"tableName": "nodes",
135+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `symbol` TEXT NOT NULL, `url` TEXT NOT NULL, `isSelected` INTEGER NOT NULL)",
136+
"fields": [
137+
{
138+
"fieldPath": "id",
139+
"columnName": "_id",
140+
"affinity": "INTEGER",
141+
"notNull": true
142+
},
143+
{
144+
"fieldPath": "symbol",
145+
"columnName": "symbol",
146+
"affinity": "TEXT",
147+
"notNull": true
148+
},
149+
{
150+
"fieldPath": "url",
151+
"columnName": "url",
152+
"affinity": "TEXT",
153+
"notNull": true
154+
},
155+
{
156+
"fieldPath": "isSelected",
157+
"columnName": "isSelected",
158+
"affinity": "INTEGER",
159+
"notNull": true
160+
}
161+
],
162+
"primaryKey": {
163+
"columnNames": [
164+
"_id"
165+
],
166+
"autoGenerate": true
167+
},
168+
"indices": [
169+
{
170+
"name": "index_nodes_symbol_url",
171+
"unique": true,
172+
"columnNames": [
173+
"symbol",
174+
"url"
175+
],
176+
"createSql": "CREATE UNIQUE INDEX `index_nodes_symbol_url` ON `${TABLE_NAME}` (`symbol`, `url`)"
177+
}
178+
],
179+
"foreignKeys": []
180+
},
181+
{
182+
"tableName": "address_books",
183+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `symbol` TEXT NOT NULL, `address` TEXT NOT NULL, `notes` TEXT NOT NULL)",
184+
"fields": [
185+
{
186+
"fieldPath": "id",
187+
"columnName": "_id",
188+
"affinity": "INTEGER",
189+
"notNull": true
190+
},
191+
{
192+
"fieldPath": "symbol",
193+
"columnName": "symbol",
194+
"affinity": "TEXT",
195+
"notNull": true
196+
},
197+
{
198+
"fieldPath": "address",
199+
"columnName": "address",
200+
"affinity": "TEXT",
201+
"notNull": true
202+
},
203+
{
204+
"fieldPath": "notes",
205+
"columnName": "notes",
206+
"affinity": "TEXT",
207+
"notNull": true
208+
}
209+
],
210+
"primaryKey": {
211+
"columnNames": [
212+
"_id"
213+
],
214+
"autoGenerate": true
215+
},
216+
"indices": [
217+
{
218+
"name": "index_address_books_symbol_address_notes",
219+
"unique": true,
220+
"columnNames": [
221+
"symbol",
222+
"address",
223+
"notes"
224+
],
225+
"createSql": "CREATE UNIQUE INDEX `index_address_books_symbol_address_notes` ON `${TABLE_NAME}` (`symbol`, `address`, `notes`)"
226+
}
227+
],
228+
"foreignKeys": []
229+
}
230+
],
231+
"setupQueries": [
232+
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
233+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"4501b5285edaa545e5ab39a9b659387e\")"
234+
]
235+
}
236+
}

0 commit comments

Comments
 (0)