Skip to content
This repository has been archived by the owner on Apr 26, 2020. It is now read-only.

Commit

Permalink
Minor formatting fix
Browse files Browse the repository at this point in the history
  • Loading branch information
DreierF committed Aug 19, 2018
1 parent 652ef4d commit bd4afa6
Showing 1 changed file with 2 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,

@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
private fun setupTransitionListener() {
val sharedElementEnterTransition = window
.sharedElementEnterTransition
val sharedElementEnterTransition = window.sharedElementEnterTransition
if (sharedElementEnterTransition != null && sharedElementEnterTransition is FabTransform) {
transitionFinished = false
window.sharedElementEnterTransition.addListener(object : TransitionAdapter() {
Expand Down Expand Up @@ -366,10 +365,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,

private fun updateEnd() {
targetView?.replaceWithEnd(data!!.currentEnd.shots, data!!.currentEnd.end.exact)
val totalEnds = if (data!!.currentRound.round.maxEndCount == null)
data!!.ends.size
else
data!!.currentRound.round.maxEndCount
val totalEnds = data!!.currentRound.round.maxEndCount ?: data!!.ends.size
binding.endTitle.text = getString(R.string.end_x_of_y, data!!.endIndex + 1, totalEnds)
binding.roundTitle.text = getString(
R.string.round_x_of_y,
Expand Down

0 comments on commit bd4afa6

Please sign in to comment.