Skip to content

Commit 35878ad

Browse files
author
xiangdong.cheng
committed
update gradle and kotlin version, fix bugs
1 parent 4599c48 commit 35878ad

15 files changed

Lines changed: 224 additions & 265 deletions

File tree

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3+
apply plugin: 'kotlin-android-extensions'
34

45
android {
5-
compileSdkVersion 27
6-
buildToolsVersion '27.0.3'
6+
compileSdkVersion 28
77
defaultConfig {
88
applicationId "com.dx.dxloadingbutton"
99
minSdkVersion 21
@@ -25,10 +25,10 @@ dependencies {
2525
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
2626
exclude group: 'com.android.support', module: 'support-annotations'
2727
})
28-
implementation 'com.android.support:appcompat-v7:27.1.1'
28+
implementation 'com.android.support:appcompat-v7:28.0.0'
2929
testImplementation 'junit:junit:4.12'
3030
implementation project(':library')
31-
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
31+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
3232
}
3333
repositories {
3434
mavenCentral()

app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
package="com.dx.dxloadingbutton">
45

56
<application
67
android:allowBackup="true"
78
android:icon="@mipmap/ic_launcher"
89
android:label="@string/app_name"
910
android:supportsRtl="true"
10-
android:theme="@style/AppTheme">
11-
<activity android:name=".MainActivity">
11+
android:theme="@style/AppTheme"
12+
tools:ignore="GoogleAppIndexingWarning">
13+
<activity android:name=".DemoActivity">
1214
<intent-filter>
1315
<action android:name="android.intent.action.MAIN" />
1416

1517
<category android:name="android.intent.category.LAUNCHER" />
1618
</intent-filter>
1719
</activity>
1820

19-
<activity android:name=".demo.DemoActivity" />
21+
<activity android:name=".demo.LoginDemoActivity" />
2022

2123
<activity android:name=".demo.SecondActivity" />
2224

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
package com.dx.dxloadingbutton
2+
3+
import android.content.Intent
4+
import android.graphics.LinearGradient
5+
import android.graphics.Shader
6+
import android.graphics.Typeface
7+
import android.os.Bundle
8+
import android.support.v7.app.AppCompatActivity
9+
import android.view.View
10+
import android.widget.Toast
11+
import com.dx.dxloadingbutton.demo.LoginDemoActivity
12+
import kotlinx.android.synthetic.main.activity_main.*
13+
14+
15+
class DemoActivity : AppCompatActivity(), View.OnClickListener {
16+
17+
18+
override fun onClick(view: View) {
19+
when (view.id) {
20+
R.id.loading_btn -> {
21+
loading_btn.startLoading()
22+
loading_btn.isEnabled = false
23+
}
24+
R.id.btn_success -> loading_btn.loadingSuccessful()
25+
R.id.btn_failed -> loading_btn.loadingFailed()
26+
R.id.btn_reset -> {
27+
loading_btn.reset()
28+
loading_btn.isEnabled = true
29+
}
30+
R.id.btn_cancel -> {
31+
loading_btn.cancelLoading()
32+
loading_btn.isEnabled = true
33+
}
34+
R.id.btn_demo -> {
35+
loading_btn.cancelLoading()
36+
startActivity(Intent(this@DemoActivity, LoginDemoActivity::class.java))
37+
}
38+
R.id.btn_enable -> loading_btn.isEnabled = !loading_btn.isEnabled
39+
}
40+
}
41+
42+
override fun onCreate(savedInstanceState: Bundle?) {
43+
super.onCreate(savedInstanceState)
44+
setContentView(R.layout.activity_main)
45+
46+
loading_btn.rippleColor = 0x33ffffff
47+
loading_btn.typeface = Typeface.SERIF
48+
loading_btn.setOnClickListener(this)
49+
loading_btn.cornerRadius = 100f
50+
val shader = LinearGradient(0f, 0f, 1000f, 100f, -0x551ac6cb, -0x5500a8de, Shader.TileMode.CLAMP)
51+
loading_btn.backgroundShader = shader
52+
loading_btn.animationEndAction = {
53+
Toast.makeText(applicationContext, "end:$it", Toast.LENGTH_SHORT).show()
54+
}
55+
56+
btn_success.setOnClickListener(this)
57+
btn_failed.setOnClickListener(this)
58+
btn_reset.setOnClickListener(this)
59+
btn_cancel.setOnClickListener(this)
60+
btn_demo.setOnClickListener(this)
61+
btn_enable.setOnClickListener(this)
62+
63+
}
64+
}

app/src/main/java/com/dx/dxloadingbutton/MainActivity.java

Lines changed: 0 additions & 73 deletions
This file was deleted.

app/src/main/java/com/dx/dxloadingbutton/demo/DemoActivity.java

Lines changed: 0 additions & 142 deletions
This file was deleted.

0 commit comments

Comments
 (0)