Skip to content

Commit 241e2fc

Browse files
REBOOTERSREBOOTERS
committed
kotlin-android-extensions removed
1 parent 0acdb8a commit 241e2fc

14 files changed

+139
-102
lines changed

‎app/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ apply plugin: 'com.android.application'
33
// Android Gradle Plugin source @ https://android.googlesource.com/platform/tools/base/+/gradle_3.1.2
44

55
apply plugin: 'kotlin-android'
6-
apply plugin: 'kotlin-android-extensions'
76
apply plugin: 'kotlin-kapt'
87

98
apply plugin: "com.dorongold.task-tree"

‎app/src/main/java/home/smart/fly/animations/SplashScreenActivity.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package home.smart.fly.animations
22

33
import android.content.Intent
4-
import androidx.appcompat.app.AppCompatActivity
54
import android.os.Bundle
6-
import kotlinx.android.synthetic.main.activity_ns.*
5+
import androidx.appcompat.app.AppCompatActivity
76

87
class SplashScreenActivity : AppCompatActivity() {
98
override fun onCreate(savedInstanceState: Bundle?) {

‎app/src/main/java/home/smart/fly/animations/ui/activity/AllActivity.kt

+9-10
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,29 @@ import android.content.Intent
44
import android.content.pm.PackageManager
55
import android.os.Bundle
66
import androidx.appcompat.app.AppCompatActivity
7+
import androidx.appcompat.widget.Toolbar
78
import androidx.recyclerview.widget.LinearLayoutManager
9+
import androidx.recyclerview.widget.RecyclerView
10+
import com.google.android.material.floatingactionbutton.FloatingActionButton
811
import com.google.android.material.snackbar.Snackbar
912
import com.zhihu.android.sugaradapter.SugarAdapter
1013
import home.smart.fly.animations.R
1114
import home.smart.fly.animations.sugar.viewholder.ActivityListViewHolder
1215
import home.smart.fly.animations.utils.AppUtils
13-
import kotlinx.android.synthetic.main.activity_all.*
14-
import kotlinx.android.synthetic.main.content_all.*
1516
import java.util.*
1617

1718
class AllActivity : AppCompatActivity() {
1819

1920
override fun onCreate(savedInstanceState: Bundle?) {
2021
super.onCreate(savedInstanceState)
2122
setContentView(R.layout.activity_all)
23+
val toolbar = findViewById<Toolbar>(R.id.toolbar)
2224
setSupportActionBar(toolbar)
23-
25+
val fab: FloatingActionButton = findViewById(R.id.fab)
2426
fab.setOnClickListener { view ->
25-
Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
26-
.setAction("Action", null).show()
27+
Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG).setAction("Action", null).show()
2728
}
28-
val adapter = SugarAdapter.Builder.with(getActivities())
29-
.add(ActivityListViewHolder::class.java)
30-
.build();
29+
val adapter = SugarAdapter.Builder.with(getActivities()).add(ActivityListViewHolder::class.java).build();
3130
adapter.addSugarHolderListener(object : SugarAdapter.SugarHolderListener<ActivityListViewHolder>() {
3231
override fun onSugarHolderBindData(holder: ActivityListViewHolder) {
3332
super.onSugarHolderBindData(holder)
@@ -39,6 +38,7 @@ class AllActivity : AppCompatActivity() {
3938
}
4039
}
4140
})
41+
val recyclerView: RecyclerView = findViewById(R.id.recyclerView)
4242
recyclerView.setHasFixedSize(true)
4343
recyclerView.layoutManager = LinearLayoutManager(this)
4444
recyclerView.adapter = adapter
@@ -47,8 +47,7 @@ class AllActivity : AppCompatActivity() {
4747

4848
private fun getActivities(): List<Pair<String, String>> {
4949
val results = ArrayList<Pair<String, String>>()
50-
val info = packageManager
51-
.getPackageInfo(AppUtils.getPackageName(this), PackageManager.GET_ACTIVITIES)
50+
val info = packageManager.getPackageInfo(AppUtils.getPackageName(this), PackageManager.GET_ACTIVITIES)
5251
for (item in info.activities) {
5352
val fullName = item.name
5453
val simpleName = fullName.substring(fullName.lastIndexOf(".") + 1)

‎app/src/main/java/home/smart/fly/animations/ui/activity/ClockViewActivity.kt

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,40 @@
11
package home.smart.fly.animations.ui.activity
22

33
import android.os.Bundle
4+
import android.view.View
5+
import android.widget.Button
6+
import android.widget.EditText
47
import androidx.appcompat.app.AppCompatActivity
58
import home.smart.fly.animations.R
6-
import kotlinx.android.synthetic.main.activity_clock_view.*
9+
import home.smart.fly.animations.customview.ClockView
710

811

912
class ClockViewActivity : AppCompatActivity() {
1013

1114
private var pauseValue = false
15+
private lateinit var clockView: ClockView
16+
private lateinit var value: EditText
17+
private lateinit var pause: Button
1218

1319
override fun onCreate(savedInstanceState: Bundle?) {
1420
super.onCreate(savedInstanceState)
1521
setContentView(R.layout.activity_clock_view)
1622

17-
18-
set.setOnClickListener{
23+
clockView = findViewById(R.id.clockView)
24+
value = findViewById(R.id.value)
25+
pause = findViewById(R.id.pause)
26+
findViewById<View>(R.id.set).setOnClickListener {
1927
clockView.setTime(Integer.parseInt(value.text.toString()))
2028
}
2129

2230

2331

24-
start.setOnClickListener {
32+
findViewById<View>(R.id.start).setOnClickListener {
2533
clockView.start()
2634
pauseValue = false
2735
}
2836

29-
pause.setOnClickListener {
37+
findViewById<View>(R.id.pause).setOnClickListener {
3038
clockView.pause()
3139
if (pauseValue) {
3240
pause.text = "PAUSE"
@@ -36,6 +44,6 @@ class ClockViewActivity : AppCompatActivity() {
3644
pauseValue = !pauseValue;
3745
}
3846

39-
stop.setOnClickListener { clockView.stop() }
47+
findViewById<View>(R.id.stop).setOnClickListener { clockView.stop() }
4048
}
4149
}

‎app/src/main/java/home/smart/fly/animations/ui/activity/LottieAnimationViewActivity.kt

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,41 @@
11
package home.smart.fly.animations.ui.activity
22

33
import android.os.Bundle
4-
import com.google.android.material.snackbar.Snackbar
4+
import android.view.View
55
import androidx.appcompat.app.AppCompatActivity
6+
import androidx.appcompat.widget.Toolbar
7+
import com.airbnb.lottie.LottieAnimationView
8+
import com.google.android.material.snackbar.Snackbar
69
import home.smart.fly.animations.R
7-
import kotlinx.android.synthetic.main.activity_lottie_animation_view.*
8-
import kotlinx.android.synthetic.main.content_lottie_animation_view.*
910

1011
class LottieAnimationViewActivity : AppCompatActivity() {
1112

1213
override fun onCreate(savedInstanceState: Bundle?) {
1314
super.onCreate(savedInstanceState)
1415
setContentView(R.layout.activity_lottie_animation_view)
16+
val toolbar: Toolbar = findViewById(R.id.toolbar)
1517
setSupportActionBar(toolbar)
1618

1719

1820

19-
fab.setOnClickListener { view ->
20-
Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
21-
.setAction("Action", null).show()
21+
findViewById<View>(R.id.fab).setOnClickListener { view ->
22+
Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG).setAction("Action", null).show()
2223
}
23-
24-
start.setOnClickListener {
24+
val animation_view: LottieAnimationView = findViewById(R.id.animation_view)
25+
findViewById<View>(R.id.start).setOnClickListener {
2526
animation_view.cancelAnimation()
2627
animation_view.setAnimation("PinJump.json")
2728
animation_view.playAnimation()
2829
}
2930

30-
success.setOnClickListener {
31+
findViewById<View>(R.id.success).setOnClickListener {
3132
animation_view.cancelAnimation()
3233
animation_view.setAnimation("ProgressSuccess.json")
3334
animation_view.loop(false)
3435
animation_view.playAnimation()
3536
}
3637

37-
error.setOnClickListener {
38+
findViewById<View>(R.id.error).setOnClickListener {
3839
animation_view.cancelAnimation()
3940
animation_view.setAnimation("x_pop.json")
4041
animation_view.playAnimation()

‎app/src/main/java/home/smart/fly/animations/ui/activity/MergeIncludeViewActivity.kt

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
package home.smart.fly.animations.ui.activity
22

33
import android.os.Bundle
4-
import androidx.core.content.ContextCompat
4+
import android.view.View
55
import androidx.appcompat.app.AppCompatActivity
6+
import androidx.core.content.ContextCompat
67
import home.smart.fly.animations.R
78
import home.smart.fly.animations.utils.StatusBarUtil
8-
import kotlinx.android.synthetic.main.include_view.*
99

1010
class MergeIncludeViewActivity : AppCompatActivity() {
1111

1212
override fun onCreate(savedInstanceState: Bundle?) {
1313
super.onCreate(savedInstanceState)
1414
StatusBarUtil.setColor(this,ContextCompat.getColor(this,R.color.colorPrimary))
1515
setContentView(R.layout.activity_merge_include_view)
16-
17-
back.setOnClickListener { finish() }
16+
findViewById<View>(R.id.back).setOnClickListener { finish() }
1817
}
1918
}

‎app/src/main/java/home/smart/fly/animations/ui/activity/OrientationActivity.kt

+22-15
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,32 @@ import android.content.res.Configuration
66
import android.os.Bundle
77
import android.text.method.ScrollingMovementMethod
88
import android.util.Log
9+
import android.widget.TextView
910
import android.widget.Toast
1011
import androidx.appcompat.app.AppCompatActivity
12+
import com.google.android.material.switchmaterial.SwitchMaterial
1113
import home.smart.fly.animations.R
1214
import io.reactivex.Observable
1315
import io.reactivex.android.schedulers.AndroidSchedulers
1416
import io.reactivex.disposables.Disposable
15-
import kotlinx.android.synthetic.main.activity_orientation.*
1617
import java.util.concurrent.TimeUnit
1718

1819
class OrientationActivity : AppCompatActivity() {
1920
private var disposable: Disposable? = null
21+
private lateinit var switcher: SwitchMaterial
22+
private lateinit var text: TextView
23+
private lateinit var pos_tv: TextView
2024

2125
@SuppressLint("SetTextI18n")
2226
override fun onCreate(savedInstanceState: Bundle?) {
2327
super.onCreate(savedInstanceState)
2428
setContentView(R.layout.activity_orientation)
29+
30+
switcher = findViewById(R.id.switcher)
31+
text = findViewById(R.id.text)
32+
pos_tv = findViewById(R.id.pos_tv)
33+
34+
2535
Toast.makeText(this, "OrientationActivity-onCreate", Toast.LENGTH_SHORT).show()
2636
switcher.setOnCheckedChangeListener { _, isChecked ->
2737
if (isChecked) {
@@ -34,22 +44,19 @@ class OrientationActivity : AppCompatActivity() {
3444
}
3545
text.movementMethod = ScrollingMovementMethod.getInstance()
3646

37-
disposable = Observable.just(0).delay(1, TimeUnit.SECONDS)
38-
.observeOn(AndroidSchedulers.mainThread())
39-
.subscribe {
40-
val xy = IntArray(2)
41-
val start = System.nanoTime()
42-
pos_tv.getLocationOnScreen(xy)
43-
Log.e(
44-
"zyq",
45-
"cost time = ${System.nanoTime() - start}"
46-
)
47-
pos_tv.text = "position info: x=${xy[0]},y=${xy[1]}"
47+
disposable = Observable.just(0).delay(1, TimeUnit.SECONDS).observeOn(AndroidSchedulers.mainThread()).subscribe {
48+
val xy = IntArray(2)
49+
val start = System.nanoTime()
50+
pos_tv.getLocationOnScreen(xy)
51+
Log.e(
52+
"zyq", "cost time = ${System.nanoTime() - start}"
53+
)
54+
pos_tv.text = "position info: x=${xy[0]},y=${xy[1]}"
4855

49-
val hour = TimeUnit.DAYS.toHours(1)
56+
val hour = TimeUnit.DAYS.toHours(1)
5057

51-
Log.e("zyq", "hour is == $hour")
52-
}
58+
Log.e("zyq", "hour is == $hour")
59+
}
5360
}
5461

5562
override fun onConfigurationChanged(newConfig: Configuration) {

‎app/src/main/java/home/smart/fly/animations/ui/activity/PhysicsViewActivity.kt

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,43 @@
11
package home.smart.fly.animations.ui.activity
22

33
import android.os.Bundle
4+
import android.widget.Button
5+
import android.widget.ImageView
6+
import androidx.appcompat.app.AppCompatActivity
47
import androidx.dynamicanimation.animation.DynamicAnimation
58
import androidx.dynamicanimation.animation.FlingAnimation
69
import androidx.dynamicanimation.animation.SpringAnimation
710
import androidx.dynamicanimation.animation.SpringForce
8-
import androidx.appcompat.app.AppCompatActivity
911
import home.smart.fly.animations.R
10-
import kotlinx.android.synthetic.main.activity_physics_view.*
1112

1213

1314
class PhysicsViewActivity : AppCompatActivity() {
1415

15-
16+
private lateinit var image: ImageView
1617
override fun onCreate(savedInstanceState: Bundle?) {
1718
super.onCreate(savedInstanceState)
1819
setContentView(R.layout.activity_physics_view)
19-
button2.text="Fling"
20+
image = findViewById(R.id.image)
21+
findViewById<Button>(R.id.button2).text = "Fling"
2022

21-
var velocity=500f
23+
var velocity = 500f
2224

23-
button2.setOnClickListener{
24-
val flingAnimation=FlingAnimation(image, DynamicAnimation.X)
25+
findViewById<Button>(R.id.button2).setOnClickListener {
26+
val flingAnimation = FlingAnimation(image, DynamicAnimation.X)
2527
flingAnimation.setStartVelocity(velocity)
2628
flingAnimation.friction = 0.5f
2729
flingAnimation.start()
2830

29-
velocity=-velocity
31+
velocity = -velocity
3032
}
3133

32-
button3.setOnClickListener {
33-
val springAnimation=SpringAnimation(image,DynamicAnimation.Y)
34+
findViewById<Button>(R.id.button3).setOnClickListener {
35+
val springAnimation = SpringAnimation(image, DynamicAnimation.Y)
3436
springAnimation.setStartValue(500f)
3537

36-
val springForce=SpringForce()
37-
springForce.dampingRatio=SpringForce.DAMPING_RATIO_HIGH_BOUNCY
38-
springForce.stiffness=SpringForce.STIFFNESS_LOW
38+
val springForce = SpringForce()
39+
springForce.dampingRatio = SpringForce.DAMPING_RATIO_HIGH_BOUNCY
40+
springForce.stiffness = SpringForce.STIFFNESS_LOW
3941
springForce.finalPosition = image.y
4042

4143
springAnimation.spring = springForce

0 commit comments

Comments
 (0)