Merge pull request #22 from EbenezerGH/app-to-library-module

Big Commit.. sorry, not sorry.  create library module, move classes a…

Author: EbenezerGH

.idea/gradle.xml

@@ -25,42 +25,19 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    /**
-     Because RxAndroid releases are few and far between, it is recommended you also
-     explicitly depend on RxJava's latest version for bug fixes and new features.
-     */
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.0.9'
-
-    /**
-     * Android Studio by default will not recognize a lot of generated Dagger 2 code as
-     * legitimate classes, but adding the android-apt plugin will add these files into the
-     * IDE class path and enable you to have more visibility.
-     */
-    compile 'com.google.dagger:dagger:2.4'
-    annotationProcessor "com.google.dagger:dagger-compiler:2.4"
-
-    // google
-    implementation 'com.android.support:design:26.1.0'
-
-    // gson
-    compile 'com.google.code.gson:gson:2.8.0'
-
-    // retrofit
-    compile 'com.squareup.retrofit2:retrofit:2.2.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.2.0'
-    compile 'com.squareup.retrofit2:adapter-rxjava2:2.2.0'
+    // kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 
     // google
     implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:design:26.1.0'
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.android.support:recyclerview-v7:26.1.0'
-
-    // kotlin
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 
     // tests
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+
+    // todo call library from https://jitpack.io/ into a main project
+    implementation project(':etherscanapi')
 }

.idea/modules.xml

@@ -1,6 +1,7 @@
 package jfyg.etherscan.helloetherescan
 
 import android.app.Application
+import jfyg.etherscanapi.ApiKey
 
 class HelloEtherscanApplication : Application() {
     override fun onCreate() {

app/build.gradle

@@ -3,58 +3,21 @@ package jfyg.etherscan.helloetherescan
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.util.Log
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-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 jfyg.etherscanapi.stats.EthereumStat
 import kotlinx.android.synthetic.main.activity_main.*
 
-//TODO: clean up and write tests
-class MainActivity : AppCompatActivity() {
-    private val TAG = javaClass.name!!
 
-    var etherPrice = EtherPriceModel()
+class MainActivity : AppCompatActivity() {
+    private val stat = EthereumStat()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
         setSupportActionBar(toolbar)
 
-        //~~~ For Testing
-        /*
-        var testing = EthereumStat()
         fab.setOnClickListener {
-            //testing.getTotalSupply()
-            //testing.getTotalSupplyInWei()
-            testing.getLastPriceInUsd()
-            testing.getLastPriceInBtc()
-            //queryStats("stats", "ethPrice")
+            Log.d("Ebenezer", stat.getLastPriceInBtc())
         }
-        */
-    }
-
-    fun queryStats(module: String, action: String) {
-        RestClient().getQuery()
-                .getEtherStats(module, action, ApiKey.takeOff.callApiKey())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribeOn(Schedulers.io())
-                .subscribe(this::handleResponse, this::handleError)
-    }
-
-    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) {
-        Log.d(TAG, "The error " + error.message)
     }
 
 }

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

@@ -1,6 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.2.30'
     ext.kotlin_version = '1.1.51'
     repositories {
         google()

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

@@ -0,0 +1 @@
+/build

build.gradle

@@ -0,0 +1,56 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion 26
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 26
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+
+    /**
+     Because RxAndroid releases are few and far between, it is recommended you also
+     explicitly depend on RxJava's latest version for bug fixes and new features.
+     */
+    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.9'
+
+    // gson
+    implementation 'com.google.code.gson:gson:2.8.0'
+
+    // retrofit
+    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+
+    // kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+
+    // tests
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.1'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+
+    repositories {
+        mavenCentral()
+    }
+
+}

etherscanapi/.gitignore

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

etherscanapi/build.gradle

@@ -0,0 +1,26 @@
+package jfyg.etherscanapi;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("jfyg.etherscanapi.test", appContext.getPackageName());
+    }
+}

etherscanapi/proguard-rules.pro

@@ -0,0 +1,2 @@
+<manifest
+    package="jfyg.etherscanapi"/>

etherscanapi/src/androidTest/java/jfyg/etherscanapi/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package jfyg.etherscan.helloetherescan
+package jfyg.etherscanapi
 
 import android.util.Log
 
@@ -18,7 +18,7 @@ class ApiKey private constructor() {
             Log.w("", "No api key seems to be added.  No record of your queries will be kept in your " +
                     "https://etherscan.io/ console")
         }
-        return ApiKey.takeOff.apiKey
+        return takeOff.apiKey
     }
 
     fun setApiKey(apiKey: String) {

etherscanapi/src/main/AndroidManifest.xml

@@ -0,0 +1,41 @@
+package jfyg.etherscanapi
+
+import android.content.ContentValues.TAG
+import android.util.Log
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import jfyg.etherscanapi.model.EtherPriceModel
+import jfyg.etherscanapi.network.RestClient
+import jfyg.etherscanapi.responses.MainResponse
+
+/**
+ * //TODO documentation
+ */
+class Queries {
+    private var etherPrice = EtherPriceModel()
+
+    fun stats(module: String, action: String) {
+        RestClient().getQuery()
+                .getEtherStats(module, action, ApiKey.takeOff.callApiKey())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribeOn(Schedulers.io())
+                .subscribe(this::handleResponse, this::handleError)
+    }
+
+    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) {
+        Log.d(TAG, "The error " + error.message)
+    }
+
+    fun fetchEtherStats(): EtherPriceModel {
+        return etherPrice
+    }
+}

app/src/main/java/jfyg/etherscan/helloetherescan/ApiKey.kt renamed to etherscanapi/src/main/java/jfyg/etherscanapi/ApiKey.kt

@@ -1,4 +1,4 @@
-package jfyg.etherscan.helloetherescan.model
+package jfyg.etherscanapi.model
 
 open class BaseModel {
     var status: String? = ""

etherscanapi/src/main/java/jfyg/etherscanapi/Queries.kt

@@ -1,4 +1,4 @@
-package jfyg.etherscan.helloetherescan.model
+package jfyg.etherscanapi.model
 
 class EtherPriceModel : BaseModel() {
     var ethBtc: String? = ""

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

@@ -1,7 +1,7 @@
-package jfyg.etherscan.helloetherescan.network
+package jfyg.etherscanapi.network
 
 import io.reactivex.Single
-import jfyg.etherscan.helloetherescan.network.responses.MainResponse
+import jfyg.etherscanapi.responses.MainResponse
 import retrofit2.http.GET
 import retrofit2.http.Query
 

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

@@ -1,4 +1,4 @@
-package jfyg.etherscan.helloetherescan.network
+package jfyg.etherscanapi.network
 
 import retrofit2.Retrofit
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory

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

@@ -1,4 +1,4 @@
-package jfyg.etherscan.helloetherescan.network.responses
+package jfyg.etherscanapi.responses
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/jfyg/etherscan/helloetherescan/network/RestClient.kt renamed to etherscanapi/src/main/java/jfyg/etherscanapi/network/RestClient.kt

@@ -1,4 +1,4 @@
-package jfyg.etherscan.helloetherescan.network.responses
+package jfyg.etherscanapi.responses
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/jfyg/etherscan/helloetherescan/network/responses/EtherPriceResponse.kt renamed to etherscanapi/src/main/java/jfyg/etherscanapi/responses/EtherPriceResponse.kt

@@ -1,18 +1,17 @@
-package jfyg.etherscan.helloetherescan.ethereum
+package jfyg.etherscanapi.stats
 
+import jfyg.etherscanapi.Queries
 
-import android.util.Log
-import jfyg.etherscan.helloetherescan.MainActivity
 
 class EthereumStat : EthereumStatFunctions {
 
-    var activity = MainActivity()
+    private var query = Queries()
 
     override fun getTotalSupply(): Long? {
         val stats = "stats"
         val ethSupply = "ethSupply"
 
-        activity.queryStats(stats, ethSupply)
+        query.stats(stats, ethSupply)
         return 0 //TODO: Figure out how to parse supply
     }
 
@@ -21,26 +20,24 @@ class EthereumStat : EthereumStatFunctions {
         val stats = "stats"
         val ethSupply = "ethSupply"
 
-        activity.queryStats(stats, ethSupply)
+        query.stats(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
+        query.stats(stats, ethPrice)
+        return query.fetchEtherStats().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
+        query.stats(stats, ethPrice)
+        return query.fetchEtherStats().ethBtc //TODO: Make this return Int
     }
 
 }

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

@@ -1,4 +1,4 @@
-package jfyg.etherscan.helloetherescan.ethereum
+package jfyg.etherscanapi.stats
 
 
 interface EthereumStatFunctions {

app/src/main/java/jfyg/etherscan/helloetherescan/ethereum/EthereumStat.kt renamed to etherscanapi/src/main/java/jfyg/etherscanapi/stats/EthereumStat.kt

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">EtherscanApi</string>
+</resources>

app/src/main/java/jfyg/etherscan/helloetherescan/ethereum/EthereumStatFunctions.kt renamed to etherscanapi/src/main/java/jfyg/etherscanapi/stats/EthereumStatFunctions.kt

@@ -0,0 +1,17 @@
+package jfyg.etherscanapi;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}

etherscanapi/src/main/res/values/strings.xml

@@ -1 +1 @@
-include ':app'
+include ':app', ':etherscanapi'