Merge pull request #5 from EbenezerGH/wireframe2

Wireframe2

Author: EbenezerGH

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

@@ -7,40 +7,50 @@ import android.view.Menu
 import android.view.MenuItem
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import jfyg.etherscan.helloetherescan.network.responses.BaseResponse
+import jfyg.etherscan.helloetherescan.ethereum.EthereumStat
+import jfyg.etherscan.helloetherescan.model.EtherPriceModel
+import jfyg.etherscan.helloetherescan.network.responses.MainResponse
 import jfyg.etherscan.helloetherescan.network.RestClient
 
 import kotlinx.android.synthetic.main.activity_main.*
-
+//TODO: clean up and write tests
 class MainActivity : AppCompatActivity() {
     private val TAG = javaClass.name!!
+
+    var etherPrice = EtherPriceModel()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
         setSupportActionBar(toolbar)
 
+        var testing = EthereumStat()
 
         fab.setOnClickListener {
-            queryPrice("1I7CRNU2QIU253UBPFVB5UV2C2PBDURAIY")
+            //testing.getTotalSupply()
+            //testing.getTotalSupplyInWei()
+            testing.getLastPriceInUsd()
+            testing.getLastPriceInBtc()
+            //queryStats("stats", "ethPrice")
         }
     }
 
-    private fun queryPrice(apiKey: String) {
+    fun queryStats(module: String, action: String) {
+        //pass apikey that will save in preferences or singleton or something.. or application class
         RestClient().getQuery()
-                .getEtherStats("stats", "ethprice", apiKey)
+                .getEtherStats(module, action, "1I7CRNU2QIU253UBPFVB5UV2C2PBDURAIYZ")
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribeOn(Schedulers.io())
                 .subscribe(this::handleResponse, this::handleError)
     }
 
-    private fun handleResponse(retrieveQuery: BaseResponse) {
-        Log.d(TAG, "status: " + retrieveQuery.status)
-        Log.d(TAG, "message: " + retrieveQuery.message)
-        Log.d(TAG, "Eth in Btc: " + retrieveQuery.etherPriceresult?.ethBtc)
-        Log.d(TAG, "Eth in Btc Timestamp: " + retrieveQuery.etherPriceresult?.ethBtcTimestamp)
-        Log.d(TAG, "Eth in Usd: " + retrieveQuery.etherPriceresult?.ethUsd)
-        Log.d(TAG, "Eth in Usd Timestamp: " + retrieveQuery.etherPriceresult?.ethUsdTimestamp)
-        //Log.d(TAG, "Eth supply: " + retrieveQuery.etherSupplyResult)
+    private fun handleResponse(retrieveQuery: MainResponse) {
+        etherPrice.status = retrieveQuery.status
+        etherPrice.message = retrieveQuery.message
+        etherPrice.ethBtc = retrieveQuery.etherPriceresult?.ethBtc
+        etherPrice.ethBtcTimestamp = retrieveQuery.etherPriceresult?.ethBtcTimestamp
+        etherPrice.ethUsd = retrieveQuery.etherPriceresult?.ethUsd
+        etherPrice.ethUsdTimestamp = retrieveQuery.etherPriceresult?.ethUsdTimestamp
     }
 
     private fun handleError(error: Throwable) {
@@ -62,4 +72,5 @@ class MainActivity : AppCompatActivity() {
             else -> super.onOptionsItemSelected(item)
         }
     }
-}
+
+}

app/src/main/java/jfyg/etherscan/helloetherescan/ethereum/EthereumStat.kt

@@ -0,0 +1,46 @@
+package jfyg.etherscan.helloetherescan.ethereum
+
+
+import android.util.Log
+import jfyg.etherscan.helloetherescan.MainActivity
+
+class EthereumStat : EthereumStatFunctions {
+
+    var activity = MainActivity()
+
+    override fun getTotalSupply(): Long? {
+        val stats = "stats"
+        val ethSupply = "ethSupply"
+
+        activity.queryStats(stats, ethSupply)
+        return 0 //TODO: Figure out how to parse supply
+    }
+
+
+    override fun getTotalSupplyInWei(): Int? {
+        val stats = "stats"
+        val ethSupply = "ethSupply"
+
+        activity.queryStats(stats, ethSupply)
+        return 0 //TODO: Figure out how to parse supply
+    }
+
+    override fun getLastPriceInUsd(): String? {
+        val stats = "stats"
+        val ethPrice = "ethprice"
+
+        activity.queryStats(stats, ethPrice)
+        Log.d("Ebenezer", activity.etherPrice.ethUsd)
+        return activity.etherPrice.ethUsd //TODO: Make this return Int
+    }
+
+    override fun getLastPriceInBtc(): String? {
+        val stats = "stats"
+        val ethPrice = "ethprice"
+
+        activity.queryStats(stats, ethPrice)
+        Log.d("Ebenezer", activity.etherPrice.ethBtc)
+        return activity.etherPrice.ethBtc //TODO: Make this return Int
+    }
+
+}

app/src/main/java/jfyg/etherscan/helloetherescan/ethereum/EthereumStatFunctions.kt

@@ -0,0 +1,26 @@
+package jfyg.etherscan.helloetherescan.ethereum
+
+
+interface EthereumStatFunctions {
+
+    /**
+     * Return Total Supply of Ether
+     */
+    fun getTotalSupply(): Long?
+
+    /**
+     * Return Total Supply of Ether in Wei
+     */
+    fun getTotalSupplyInWei(): Int?
+
+    /**
+     * Return Last price of ether in Btc
+     */
+    fun getLastPriceInBtc(): String?
+
+    /**
+     * Return Last price of ether in Usd
+     */
+    fun getLastPriceInUsd(): String?
+
+}

app/src/main/java/jfyg/etherscan/helloetherescan/model/BaseModel.kt

@@ -0,0 +1,7 @@
+package jfyg.etherscan.helloetherescan.model
+
+open class BaseModel {
+    var status: String? = ""
+    var message: String? = ""
+
+}

app/src/main/java/jfyg/etherscan/helloetherescan/model/EtherPriceModel.kt

@@ -0,0 +1,9 @@
+package jfyg.etherscan.helloetherescan.model
+
+class EtherPriceModel : BaseModel() {
+    var ethBtc: String? = ""
+    var ethBtcTimestamp: String? = ""
+    var ethUsd: String? = ""
+    var ethUsdTimestamp: String? = ""
+    
+}

app/src/main/java/jfyg/etherscan/helloetherescan/network/NetworkService.kt

@@ -1,7 +1,7 @@
 package jfyg.etherscan.helloetherescan.network
 
-import io.reactivex.Observable
-import jfyg.etherscan.helloetherescan.network.responses.BaseResponse
+import io.reactivex.Single
+import jfyg.etherscan.helloetherescan.network.responses.MainResponse
 import retrofit2.http.GET
 import retrofit2.http.Query
 
@@ -13,5 +13,5 @@ interface NetworkService {
     @GET("api")
     fun getEtherStats(@Query("module") module: String,
                       @Query("action") action: String,
-                      @Query("apikey") apikey: String): Observable<BaseResponse>
+                      @Query("apikey") apikey: String): Single<MainResponse>
 }

app/src/main/java/jfyg/etherscan/helloetherescan/network/responses/BaseResponse.kt renamed to app/src/main/java/jfyg/etherscan/helloetherescan/network/responses/MainResponse.kt

@@ -5,7 +5,7 @@ import com.google.gson.annotations.SerializedName
 /**
  * Base response that all queries will utilize
  */
-open class BaseResponse {
+class MainResponse {
 
     @SerializedName("status")
     var status: String = ""
@@ -14,9 +14,6 @@ open class BaseResponse {
     var message: String = ""
 
     @SerializedName("result")
-    open var etherPriceresult: EtherPriceResponse? = null
+    var etherPriceresult: EtherPriceResponse? = null
 
-    //TODO: Figure out how to handle the same response name coming in from different queries
-    //@SerializedName("result")
-    //open var etherSupplyResult: String = ""
 }