Commit graph

207 commits

Author SHA1 Message Date
Severiano Jaramillo
94cebb119a fixed merge conflicts 2017-11-29 01:50:46 -06:00
Severiano Jaramillo
6bdeab545b Added toolbar elements and fab animations to board activity 2017-11-29 01:40:41 -06:00
Javier Varona
a541a70c1a - Adding send and cancel button to Send DialogFragment
- Adding ReceiveTransaction DialogFragment.
- Generating QrCode to receive transactions
2017-11-28 21:50:46 -04:00
Severiano Jaramillo
3178798d9b build.graddle addition of google 2017-11-22 21:56:03 -06:00
sjaramillo10
e7c7f5a8c7 Added bottom buttons to balance, transactions and contacts 2017-11-22 21:56:03 -06:00
sjaramillo10
0fd8572649 Added custom toolbar and tab labels to board activity 2017-11-22 21:54:33 -06:00
sjaramillo10
1ef802ab13 Fixed app theme 2017-11-22 21:50:24 -06:00
sjaramillo10
a64606ccbf Fixed small issues and added comments 2017-11-22 21:50:24 -06:00
sjaramillo10
992de4f313 Added bottom buttons to balance, transactions and contacts 2017-11-22 21:50:24 -06:00
sjaramillo10
100cec7a2f Added custom toolbar and tab labels to board activity 2017-11-22 21:50:24 -06:00
Javier Varona
cef71b382b - Creating the send fragment
- Fixing Asset validation when sending
2017-11-22 22:11:41 -04:00
sjaramillo10
3d4d764a78 Fixed app theme 2017-11-21 20:27:27 -06:00
Javier Varona
5946df1885 - Added e-receipts. If the user makes a click to a transaction in the transaction list, that will make appear a e-receipt for that transaction. 2017-11-21 21:26:24 -04:00
Javier Varona
2b638acd89 - Fixing Transaction list to work properly
- Improving UI transaction list info
2017-11-20 22:24:48 -04:00
sjaramillo10
05bc7bea65 Fixed small issues and added comments 2017-11-17 00:05:41 -06:00
sjaramillo10
2cb9afb645 Added bottom buttons to balance, transactions and contacts 2017-11-16 23:43:10 -06:00
sjaramillo10
575b85ebb4 Added custom toolbar and tab labels to board activity 2017-11-16 22:56:43 -06:00
sjaramillo10
8019b30e0f Merge branch 'master' of https://github.com/sjaramillo10/crystal-wallet-android 2017-11-16 22:54:40 -06:00
Javier Varona
8745b32446 - Equivalence values working! 2017-11-15 23:17:34 -04:00
henry
8bec42de1a Graphene Api with equivalent value using a name for the base asset 2017-11-15 21:47:11 -04:00
henry
616e44d59c Merge remote-tracking branch 'origin/master' 2017-11-15 07:51:47 -04:00
henry
37141d06cd Import compare the owner not the active key, for compatibility with openledger 2017-11-15 07:51:31 -04:00
Agorise
b16543e55d
Update LICENSE 2017-11-15 12:55:39 +02:00
Severiano Jaramillo Quintanar
5207bd9118
Merge pull request #1 from Agorise/master
need latest commits
2017-11-14 21:04:48 -06:00
henry
f6340de2e4 change url of the bitshares api server 2017-11-14 22:50:25 -04:00
Javier Varona
2afd7ec47a - Fixed EquivalenceThread to loop in a separated thread. 2017-11-14 22:29:11 -04:00
Javier Varona
cf6fcac6cc - Added comments in Crypto Net Balances, Crypto Coin Balances and Transaction List 2017-11-13 22:53:30 -04:00
henry
2157a135d1 updated app to use in studio 3.0 2017-11-13 20:18:40 -04:00
henry
3d4c90f8eb Added the get asset by name
Update equivalent value url. If we are going to use the testnet the equivalent value has to be retrieved from the main net.
Update docs and code
2017-11-12 23:04:06 -04:00
henry
000be8ab51 Added the get asset by name
Update equivalent value url. If we are going to use the testnet the equivalent value has to be retrieved from the main net.
Update docs and code
2017-11-12 15:20:03 -04:00
Javier Varona
a9ec777e5c - Fixed the way the equivalences are loaded in the balances. Now they load independent from the balance amount 2017-11-10 22:08:23 -04:00
Javier Varona
598c58a83f - Making the service to ask for equivalent values every minute 2017-11-08 22:42:22 -04:00
Javier Varona
3a27dcbe23 Merge branch 'master' of https://github.com/Agorise/crystal-wallet-android 2017-11-08 21:41:43 -04:00
Javier Varona
e52ab7b714 - Change balances to show equivalences with the currency from the preferred country of the user 2017-11-08 20:37:23 -04:00
henry
10798b8e0c Merge remote-tracking branch 'origin/master' 2017-11-07 22:21:20 -04:00
Javier Varona
6dae8cb681 Merge branch 'master' of https://github.com/Agorise/crystal-wallet-android 2017-11-07 22:18:51 -04:00
Javier Varona
2c99ee9780 - Added General Settings layout and activity
- Now the user can set the prefered country. Which will set also the prefered currency.
- Added the general setting model, viewmodel and dao
2017-11-07 22:18:31 -04:00
henry
c4278c7e75 equivalent values in batch 2017-11-07 22:14:43 -04:00
henry
5146bc818c Merge branch 'master' of https://github.com/Agorise/crystal-wallet-android 2017-11-06 21:39:23 -04:00
henry
322ffed6b9 Equivalent Value in services 2017-11-06 21:38:42 -04:00
Javier Varona
5f7470b1ef Merge branch 'master' of https://github.com/Agorise/crystal-wallet-android 2017-11-05 22:16:37 -04:00
Javier Varona
213cc07c80 - Change intro to send the user to import seed when there isn't one
- Now the equivalent value shows in the balance view
2017-11-05 20:38:37 -04:00
henry
3005b60935 Added bitshares faucet api only with text 2017-11-04 23:22:53 -04:00
henry
376b6278b3 pdate the graphene library used 2017-11-02 21:00:36 -04:00
Javier Varona
00d45cadd7 - Equivalence DAOs created 2017-11-01 22:31:31 -04:00
Javier Varona
60ef2eb4ba - The send activity can be reached in the balance view
- Fixing the Currency Adapter Labels
2017-11-01 12:26:52 -04:00
Javier Varona
2590bb42ed - Adding send and receive buttons to the balances views
- Now the transactions view appears as the second Page of the Board Activity
2017-10-28 21:58:00 -04:00
Javier Varona
131a5c5ea8 - Now the name of the coins appears in the balances, instead of "unknown"; 2017-10-28 20:58:39 -04:00
Javier Varona
08152814b3 Merge branch 'master' of https://github.com/Agorise/crystal-wallet-android 2017-10-25 23:06:58 -04:00
Javier Varona
b62dec59c2 - Finishing the send view 2017-10-25 23:06:38 -04:00