Skip to content

Commit dd4dee3

Browse files
committed
feat[issue#2]: added runtime change time of single dislay time
refactor: update dependencies in example and up target sdk to 30
1 parent 3bdbd07 commit dd4dee3

16 files changed

Lines changed: 79 additions & 43 deletions

File tree

app/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ plugins {
66
}
77

88
android {
9-
compileSdkVersion(29)
9+
compileSdkVersion(30)
1010
defaultConfig {
1111
applicationId = "com.genius.multiprogressbarexample"
1212
minSdkVersion(16)
13-
targetSdkVersion(29)
13+
targetSdkVersion(30)
1414
versionCode = 1
1515
versionName = "1.0"
1616
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -27,8 +27,8 @@ dependencies {
2727
implementation(project(":multiprogressbar"))
2828
implementation(kotlin("stdlib-jdk7", KotlinCompilerVersion.VERSION))
2929
implementation("androidx.appcompat:appcompat:1.2.0")
30-
implementation("androidx.core:core-ktx:1.3.1")
31-
implementation("androidx.constraintlayout:constraintlayout:1.1.3")
30+
implementation("androidx.core:core-ktx:1.3.2")
31+
implementation("androidx.constraintlayout:constraintlayout:2.0.4")
3232

3333
testImplementation("junit:junit:4.13.1")
3434
testImplementation("org.mockito:mockito-core:3.3.3")

app/src/main/java/com/genius/multiprogressbarexample/MainActivity.kt

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,28 @@ package com.genius.multiprogressbarexample
33
import androidx.appcompat.app.AppCompatActivity
44
import android.os.Bundle
55
import android.util.Log
6-
import android.widget.Button
6+
import android.view.View
77
import com.genius.multiprogressbar.MultiProgressBar
88

9-
class MainActivity : AppCompatActivity(), MultiProgressBar.ProgressStepChangeListener {
9+
class MainActivity : AppCompatActivity(R.layout.activity_main), MultiProgressBar.ProgressStepChangeListener, View.OnClickListener {
10+
11+
private val progressBar: MultiProgressBar by lazy { findViewById(R.id.mpb_main) }
1012

1113
override fun onCreate(savedInstanceState: Bundle?) {
1214
super.onCreate(savedInstanceState)
13-
setContentView(R.layout.activity_main)
14-
15-
val progressBar = findViewById<MultiProgressBar>(R.id.mpb_main)
16-
val buttonStart = findViewById<Button>(R.id.b_start)
17-
val buttonPause = findViewById<Button>(R.id.b_pause)
18-
val buttonNext = findViewById<Button>(R.id.b_next)
19-
val buttonPrevious = findViewById<Button>(R.id.b_previous)
20-
val buttonClear = findViewById<Button>(R.id.b_clear)
2115

2216
progressBar.setListener(this)
17+
}
2318

24-
buttonStart.setOnClickListener {
25-
progressBar.start()
26-
}
27-
28-
buttonPause.setOnClickListener {
29-
progressBar.pause()
30-
}
31-
32-
buttonNext.setOnClickListener {
33-
progressBar.next()
34-
}
35-
36-
buttonPrevious.setOnClickListener {
37-
progressBar.previous()
38-
}
39-
40-
buttonClear.setOnClickListener {
41-
progressBar.clear()
19+
override fun onClick(v: View?) {
20+
when (v?.id) {
21+
R.id.b_start -> progressBar.start()
22+
R.id.b_pause -> progressBar.pause()
23+
R.id.b_next -> progressBar.next()
24+
R.id.b_previous -> progressBar.previous()
25+
R.id.b_plus_second -> progressBar.setSingleDisplayTime(progressBar.getSingleDisplayTime() + 1F)
26+
R.id.b_minus_second -> progressBar.setSingleDisplayTime(progressBar.getSingleDisplayTime() - 1F)
27+
R.id.b_clear -> progressBar.clear()
4228
}
4329
}
4430

176 Bytes
Loading
194 Bytes
Loading
125 Bytes
Loading
130 Bytes
Loading
190 Bytes
Loading
194 Bytes
Loading
265 Bytes
Loading
275 Bytes
Loading

0 commit comments

Comments
 (0)