Minor cleanup
diff --git a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/BaseEpoxyFragment.kt b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/BaseEpoxyFragment.kt
index cd982d2..1eb4d0f 100644
--- a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/BaseEpoxyFragment.kt
+++ b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/BaseEpoxyFragment.kt
@@ -19,7 +19,6 @@
}
}
-
abstract class BaseEpoxyFragment : BaseMvRxFragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
@@ -27,7 +26,6 @@
recyclerView.setController(BaseEpoxyController { buildModels() })
}
-
override fun invalidate() {
recyclerView.requestModelBuild()
}
diff --git a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/PlayerFragment.kt b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/PlayerFragment.kt
index de1c360..311ba1c 100644
--- a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/PlayerFragment.kt
+++ b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/PlayerFragment.kt
@@ -118,32 +118,8 @@
invertColor(it)
}
- minFrameView.setOnClickListener {
- val minFrameView = EditText(context)
- minFrameView.setText(animationView.minFrame.toInt().toString())
- AlertDialog.Builder(context)
- .setTitle(R.string.min_frame_dialog)
- .setView(minFrameView)
- .setPositiveButton("Load") { _, _ ->
- viewModel.setMinFrame(minFrameView.text.toString().toIntOrNull() ?: 0)
- }
- .setNegativeButton("Cancel") { dialog, _ -> dialog.dismiss() }
- .show()
- }
-
- maxFrameView.setOnClickListener {
- val maxFrameView = EditText(context)
- maxFrameView.setText(animationView.maxFrame.toInt().toString())
- AlertDialog.Builder(context)
- .setTitle(R.string.max_frame_dialog)
- .setView(maxFrameView)
- .setPositiveButton("Load") { _, _ ->
- viewModel.setMaxFrame(maxFrameView.text.toString().toIntOrNull() ?: 0)
- }
- .setNegativeButton("Cancel") { dialog, _ -> dialog.dismiss() }
- .show()
- }
-
+ minFrameView.setOnClickListener { showMinFrameDialog() }
+ maxFrameView.setOnClickListener { showMaxFrameDialog() }
viewModel.selectSubscribe(PlayerState::minFrame, PlayerState::maxFrame) { minFrame, maxFrame ->
animationView.setMinAndMaxFrame(minFrame, maxFrame)
// I think this is a lint bug. It complains about int being <ErrorType>
@@ -359,6 +335,32 @@
keyPathsBehavior.state = BottomSheetBehavior.STATE_HIDDEN
}
+ private fun showMinFrameDialog() {
+ val minFrameView = EditText(context)
+ minFrameView.setText(animationView.minFrame.toInt().toString())
+ AlertDialog.Builder(context)
+ .setTitle(R.string.min_frame_dialog)
+ .setView(minFrameView)
+ .setPositiveButton("Load") { _, _ ->
+ viewModel.setMinFrame(minFrameView.text.toString().toIntOrNull() ?: 0)
+ }
+ .setNegativeButton("Cancel") { dialog, _ -> dialog.dismiss() }
+ .show()
+ }
+
+ private fun showMaxFrameDialog() {
+ val maxFrameView = EditText(context)
+ maxFrameView.setText(animationView.maxFrame.toInt().toString())
+ AlertDialog.Builder(context)
+ .setTitle(R.string.max_frame_dialog)
+ .setView(maxFrameView)
+ .setPositiveButton("Load") { _, _ ->
+ viewModel.setMaxFrame(maxFrameView.text.toString().toIntOrNull() ?: 0)
+ }
+ .setNegativeButton("Cancel") { dialog, _ -> dialog.dismiss() }
+ .show()
+ }
+
private fun View.animateVisible(visible: Boolean) {
beginDelayedTransition()
isVisible = visible
