Skip to content

Commit 285a0db

Browse files
EbenezerGHEbenezerGH
authored
Merge pull request #74 from EbenezerGH/library-refractoring
package and class name refactoring
2 parents 2b7422f + 61f88c2 commit 285a0db

Some content is hidden

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

41 files changed

+153
-139
lines changed

‎app/src/main/java/jfyg/etherscan/helloetherescan/MainActivity.kt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import android.support.v7.app.AppCompatActivity
55
import android.util.Log
66
import io.reactivex.android.schedulers.AndroidSchedulers
77
import io.reactivex.rxkotlin.subscribeBy
8-
import jfyg.account.Account
9-
import jfyg.contract.ContractABI
10-
import jfyg.stat.Stat
11-
import jfyg.transaction.TxContractStatus
8+
import jfyg.data.account.Account
9+
import jfyg.data.contract.ContractABI
10+
import jfyg.data.stat.Stat
11+
import jfyg.data.transaction.TxContractStatus
1212
import kotlinx.android.synthetic.main.activity_main.*
1313

1414

@@ -30,7 +30,8 @@ class MainActivity : AppCompatActivity() {
3030
fab.setOnClickListener {
3131

3232
//stat test
33-
stat.getLastPriceInBtc().observeOn(AndroidSchedulers.mainThread())
33+
stat.getLastPriceInBtc()
34+
.observeOn(AndroidSchedulers.mainThread())
3435
?.subscribeBy {
3536
Log.d(TAG, "The current price of Ether in Btc: $it")
3637
}

etherscanapi/src/main/java/jfyg/model/Balances.kt renamed to etherscanapi/src/main/java/jfyg/data/Balances.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package jfyg.model
1+
package jfyg.data
22

33
data class Balances(var account: String? = null,
44

etherscanapi/src/main/java/jfyg/model/Blocks.kt renamed to etherscanapi/src/main/java/jfyg/data/Blocks.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package jfyg.model
1+
package jfyg.data
22

33
data class Blocks(var blockNumber: String? = null,
44

etherscanapi/src/main/java/jfyg/model/StatPrice.kt renamed to etherscanapi/src/main/java/jfyg/data/StatPrice.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package jfyg.model
1+
package jfyg.data
22

33
import com.google.gson.annotations.SerializedName
44

etherscanapi/src/main/java/jfyg/model/TxExecutionStatus.kt renamed to etherscanapi/src/main/java/jfyg/data/TxExecutionStatus.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package jfyg.model
1+
package jfyg.data
22

33
data class TxExecutionStatus(var isError: String? = null,
44

etherscanapi/src/main/java/jfyg/model/TxReceiptStatus.kt renamed to etherscanapi/src/main/java/jfyg/data/TxReceiptStatus.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
package jfyg.model
1+
package jfyg.data
22

33
data class TxReceiptStatus(var status: String? = null)

etherscanapi/src/main/java/jfyg/model/Txs.kt renamed to etherscanapi/src/main/java/jfyg/data/Txs.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package jfyg.model
1+
package jfyg.data
22

33
import com.google.gson.annotations.SerializedName
44

etherscanapi/src/main/java/jfyg/model/TxsInternal.kt renamed to etherscanapi/src/main/java/jfyg/data/TxsInternal.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package jfyg.model
1+
package jfyg.data
22

33
import com.google.gson.annotations.SerializedName
44

@@ -9,10 +9,10 @@ data class TxsInternal(var blockNumber: String? = null,
99
var hash: String? = null,
1010

1111
@SerializedName("from")
12-
var transactionFrom: String? = null,
12+
var transactionFrom: String? = null,
1313

1414
@SerializedName("to")
15-
var transactionTo: String? = null,
15+
var transactionTo: String? = null,
1616

1717
var value: String? = null,
1818

etherscanapi/src/main/java/jfyg/account/Account.kt renamed to etherscanapi/src/main/java/jfyg/data/account/Account.kt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
1-
package jfyg.account
1+
package jfyg.data.account
22

33
import io.reactivex.Single
4-
import jfyg.model.Balances
5-
import jfyg.model.Blocks
6-
import jfyg.model.Txs
7-
import jfyg.model.TxsInternal
8-
import jfyg.queries.QueryMediator
4+
import jfyg.data.Balances
5+
import jfyg.data.Blocks
6+
import jfyg.data.Txs
7+
import jfyg.data.TxsInternal
8+
import jfyg.network.queries.ApiQuery
99
import jfyg.utils.QueryUtils
1010

1111
/**
1212
* https://etherscan.io/apis#accounts
1313
*/
1414
class Account : AccountContract {
1515

16-
private val query = QueryMediator()
16+
private val query = ApiQuery()
1717
private val genericNetworkQuery = query.accountBalance("account",
1818
"balance",
1919
"0x82e4499D4b2A669831a3881d61BB24f7b620c61a",
2020
"latest")
2121

22-
private val queryUtil = QueryUtils()
23-
2422
/**
2523
* Return account balance
2624
*/
@@ -36,7 +34,7 @@ class Account : AccountContract {
3634
override fun getMultiBalance(addresses: ArrayList<String>?): Single<ArrayList<Balances>> =
3735
query.accountMultiBalance("account",
3836
"balancemulti",
39-
queryUtil.retrieveList(addresses),
37+
QueryUtils.retrieveList(addresses),
4038
"latest").map { it.result }
4139

4240
/**

etherscanapi/src/main/java/jfyg/account/AccountContract.kt renamed to etherscanapi/src/main/java/jfyg/data/account/AccountContract.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package jfyg.account
1+
package jfyg.data.account
22

33
import io.reactivex.Single
4-
import jfyg.model.Balances
5-
import jfyg.model.Blocks
6-
import jfyg.model.Txs
7-
import jfyg.model.TxsInternal
4+
import jfyg.data.Balances
5+
import jfyg.data.Blocks
6+
import jfyg.data.Txs
7+
import jfyg.data.TxsInternal
88

99
/**
1010
* https://etherscan.io/apis#accounts

0 commit comments

Comments
 (0)