Merge pull request #86 from EbenezerGH/project-wide-refactor

address issues #82,#78,#84,#81,#80

Author: EbenezerGH

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

@@ -5,11 +5,11 @@ import android.support.v7.app.AppCompatActivity
 import android.util.Log
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.rxkotlin.subscribeBy
-import jfyg.data.account.Account
-import jfyg.data.block.BlocksMined
-import jfyg.data.contract.ContractABI
-import jfyg.data.stat.Stat
-import jfyg.data.transaction.TxStatus
+import jfyg.data.account.Accounts
+import jfyg.data.block.Blocks
+import jfyg.data.contract.Contracts
+import jfyg.data.stat.Stats
+import jfyg.data.transaction.Transactions
 import kotlinx.android.synthetic.main.activity_main.*
 
 
@@ -22,11 +22,11 @@ class MainActivity : AppCompatActivity() {
         setSupportActionBar(toolbar)
 
         //************************************************  Used To Test Singles returned from etherscanapi Module
-        val stat = Stat()
-        val account = Account()
-        val contract = ContractABI()
-        val tx = TxStatus()
-        val blocks = BlocksMined()
+        val stat = Stats()
+        val account = Accounts()
+        val contract = Contracts()
+        val tx = Transactions()
+        val blocks = Blocks()
 
 
         fab.setOnClickListener {
@@ -69,7 +69,7 @@ class MainActivity : AppCompatActivity() {
                     ?.subscribeBy(
                             onSuccess = {
                                 Log.d(TAG, "The block miner is: ${it.blockMiner} and " +
-                                        "the first minor : ${it.uncles?.get(0)?.miner}")
+                                        "the first miner : ${it.uncles[0].miner}")
                             },
                             onError = { Log.d(TAG, "error receiving blocks mined") })
         }

etherscanapi/src/main/java/jfyg/data/Balance.kt

@@ -0,0 +1,5 @@
+package jfyg.data
+
+data class Balance(var account: String? = null,
+
+                   var balance: String? = null)

etherscanapi/src/main/java/jfyg/data/Balances.kt

@@ -0,0 +1,7 @@
+package jfyg.data
+
+data class BlockAccount(var blockNumber: String? = null,
+
+                        var timeStamp: String? = null,
+
+                        var blockReward: String? = null)

etherscanapi/src/main/java/jfyg/data/BlockAccount.kt

@@ -0,0 +1,11 @@
+package jfyg.data
+
+data class BlockMined(var blockNumber: String? = null,
+
+                      var timeStamp: String? = null,
+
+                      var blockMiner: String? = null,
+
+                      var blockReward: String? = null,
+
+                      var uncles: List<Uncle> = emptyList())

etherscanapi/src/main/java/jfyg/data/BlockMined.kt

@@ -0,0 +1,42 @@
+package jfyg.data
+
+import com.google.gson.annotations.SerializedName
+
+data class Tx(var blockNumber: String? = null,
+
+              var timeStamp: String? = null,
+
+              var hash: String? = null,
+
+              var nonce: String? = null,
+
+              var blockHash: String? = null,
+
+              var transactionIndex: String? = null,
+
+              @SerializedName("from")
+               var transactionFrom: String? = null,
+
+              @SerializedName("to")
+               var transactionTo: String? = null,
+
+              var value: String? = null,
+
+              var gas: String? = null,
+
+              var gasPrice: String? = null,
+
+              var isError: String? = null,
+
+              @SerializedName("txreceipt_status")
+               var receiptStatus: String? = null,
+
+              var input: String? = null,
+
+              var contractAddress: String? = null,
+
+              var cumulativeGasUsed: String? = null,
+
+              var gasUsed: String? = null,
+
+              var confirmations: String? = null)

etherscanapi/src/main/java/jfyg/data/Blocks.kt

@@ -0,0 +1,10 @@
+package jfyg.data
+
+import com.google.gson.annotations.SerializedName
+
+data class Uncle(var miner: String? = null,
+
+                 var unclePosition: String? = null,
+
+                 @SerializedName("blockreward")
+                  var blockReward: String? = null)