Skip to content

Moved finishing callback to ProgressStepChangeListener; added method … #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MorANDarty wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Moved finishing callback to ProgressStepChangeListener; added method … #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions app/src/main/java/com/genius/multiprogressbarexample/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@ import android.view.View
import com.genius.multiprogressbar.MultiProgressBar

class MainActivity : AppCompatActivity(R.layout.activity_main), MultiProgressBar.ProgressStepChangeListener,
View.OnClickListener, MultiProgressBar.ProgressFinishListener {
View.OnClickListener {

private val progressBar: MultiProgressBar by lazy { findViewById(R.id.mpb_main) }

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

progressBar.setListener(this)
progressBar.setFinishListener(this)
}

override fun onClick(v: View?) {
Expand All @@ -34,7 +33,7 @@ class MainActivity : AppCompatActivity(R.layout.activity_main), MultiProgressBar
Log.d("STEP", "Current step is $newStep")
}

override fun onProgressFinished() {
Log.d("PROGRESS", "Progress finished")
override fun onFinished() {
Log.d("FINISH", "We are finished stories")
}
}
24 changes: 15 additions & 9 deletions multiprogressbar/src/main/java/com/genius/multiprogressbar/MultiProgressBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ class MultiProgressBar @JvmOverloads constructor(
private var singleDisplayedTime: Float = 1F

private var stepChangeListener: ProgressStepChangeListener? = null
private var finishListener: ProgressFinishListener? = null
private var progressPercents: Int

private var currentAbsoluteProgress = 0F
Expand Down Expand Up @@ -284,10 +283,6 @@ class MultiProgressBar @JvmOverloads constructor(
this.stepChangeListener = stepChangeListener
}

fun setFinishListener(finishListener: ProgressFinishListener?) {
this.finishListener = finishListener
}

fun setProgressStepsCount(progressSteps: Int) {
internalSetProgressStepsCount(progressSteps)
}
Expand Down Expand Up @@ -386,6 +381,19 @@ class MultiProgressBar @JvmOverloads constructor(
return singleDisplayedTime
}

fun nextTo(position: Int) {
if (isProgressIsRunning) {
pause()
currentAbsoluteProgress = position.toFloat().coerceAtMost(countOfProgressSteps.toFloat()) * progressPercents
animatedAbsoluteProgress = currentAbsoluteProgress
start()
} else {
currentAbsoluteProgress = position.toFloat().coerceAtMost(countOfProgressSteps.toFloat()) * progressPercents
animatedAbsoluteProgress = currentAbsoluteProgress
invalidate()
}
}

private fun internalStartProgress() {
val maxValue = countOfProgressSteps * progressPercents.toFloat()
activeAnimator = ValueAnimator.ofFloat(animatedAbsoluteProgress, maxValue).apply {
Expand All @@ -403,7 +411,7 @@ class MultiProgressBar @JvmOverloads constructor(
} else if (value == maxValue) {
currentAbsoluteProgress = maxValue
animatedAbsoluteProgress = maxValue
finishListener?.onProgressFinished()
stepChangeListener?.onFinished()
true
} else false

Expand Down Expand Up @@ -467,10 +475,8 @@ class MultiProgressBar @JvmOverloads constructor(

interface ProgressStepChangeListener {
fun onProgressStepChange(newStep: Int)
}

interface ProgressFinishListener {
fun onProgressFinished()
fun onFinished()
}

private companion object {
Expand Down