Skip to content

Commit 8c3f935

Browse files
authored
Merge pull request #93 from EbenezerGH/cleanup-sample-project
Cleanup sample project
2 parents 28c6a70 + 1a1c450 commit 8c3f935

30 files changed

+12
-10
lines changed

README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[![Generic badge](https://img.shields.io/badge/EtherscanApi-UP-brightgreen.svg)](https://api.etherscan.io/api?module=stats&action=ethprice&apikey=YourApiKeyToken)
2+
[![Generic badge](https://img.shields.io/badge/CircleCI-UP-brightgreen.svg)](https://circleci.com/gh/EbenezerGH/hello_etherscan/tree/master)
23
[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/EbenezerGH/hello_etherscan/blob/update-documentation/LICENSE)
3-
[![CircleCI](https://circleci.com/gh/EbenezerGH/hello_etherscan/tree/master.svg?style=svg)](https://circleci.com/gh/EbenezerGH/hello_etherscan/tree/master)
4-
54

65
# etherscan-android-api
76

File renamed without changes.
File renamed without changes.

sample-project/src/main/AndroidManifest.xml renamed to etherscan-sample/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
<uses-permission android:name="android.permission.INTERNET"/>
66

77
<application
8-
android:name=".HelloEtherscanApplication"
8+
android:name=".EtherscanSampleApplication"
99
android:allowBackup="true"
1010
android:icon="@mipmap/ic_launcher"
1111
android:label="@string/app_name"
1212
android:roundIcon="@mipmap/ic_launcher_round"
1313
android:supportsRtl="true"
1414
android:theme="@style/AppTheme">
1515
<activity
16-
android:name=".MainActivity"
16+
android:name=".SampleActivity"
1717
android:label="@string/app_name"
1818
android:theme="@style/AppTheme.NoActionBar">
1919
<intent-filter>

sample-project/src/main/java/jfyg/etherscan/helloetherescan/HelloEtherscanApplication.kt renamed to etherscan-sample/src/main/java/jfyg/etherscan/helloetherescan/EtherscanSampleApplication.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package jfyg.etherscan.helloetherescan
33
import android.app.Application
44
import jfyg.ApiKey
55

6-
class HelloEtherscanApplication : Application() {
6+
class EtherscanSampleApplication : Application() {
77
override fun onCreate() {
88
super.onCreate()
99

sample-project/src/main/java/jfyg/etherscan/helloetherescan/MainActivity.kt renamed to etherscan-sample/src/main/java/jfyg/etherscan/helloetherescan/SampleActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import jfyg.data.transaction.Transactions
1313
import kotlinx.android.synthetic.main.activity_main.*
1414

1515

16-
class MainActivity : AppCompatActivity() {
16+
class SampleActivity : AppCompatActivity() {
1717
private val TAG = javaClass.name
1818

1919
override fun onCreate(savedInstanceState: Bundle?) {

sample-project/src/main/res/layout/activity_main.xml renamed to etherscan-sample/src/main/res/layout/activity_main.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
7-
tools:context="jfyg.etherscan.helloetherescan.MainActivity">
7+
tools:context="jfyg.etherscan.helloetherescan.SampleActivity">
88

99
<android.support.design.widget.AppBarLayout
1010
android:layout_width="match_parent"

sample-project/src/main/res/layout/content_main.xml renamed to etherscan-sample/src/main/res/layout/content_main.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
app:layout_behavior="@string/appbar_scrolling_view_behavior"
8-
tools:context="jfyg.etherscan.helloetherescan.MainActivity"
8+
tools:context="jfyg.etherscan.helloetherescan.SampleActivity"
99
tools:showIn="@layout/activity_main">
1010

1111
<TextView

sample-project/src/main/res/menu/menu_main.xml renamed to etherscan-sample/src/main/res/menu/menu_main.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<menu xmlns:android="http://schemas.android.com/apk/res/android"
22
xmlns:app="http://schemas.android.com/apk/res-auto"
33
xmlns:tools="http://schemas.android.com/tools"
4-
tools:context="jfyg.etherscan.helloetherescan.MainActivity">
4+
tools:context="jfyg.etherscan.helloetherescan.SampleActivity">
55
<item
66
android:id="@+id/action_settings"
77
android:orderInCategory="100"

etherscanapi/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ dependencies {
4444
// kotlin
4545
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
4646

47+
// timber
48+
implementation 'com.jakewharton.timber:timber:4.7.0'
49+
4750
// tests
4851
testImplementation 'junit:junit:4.12'
4952
testImplementation 'org.mockito:mockito-core:2.17.0'

settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include ':sample-project', ':etherscanapi'
1+
include ':etherscan-sample', ':etherscanapi'

0 commit comments

Comments
 (0)