From 95a926aed5123d718daf1db7274834a33fe4b8ca Mon Sep 17 00:00:00 2001 From: Laurent Date: Wed, 8 Feb 2023 10:52:54 +0100 Subject: [PATCH] minor code improvements --- .../ui/fragment/components/bottomsheet/BottomSheetFragment.kt | 4 ++-- .../android/ui/viewmodel/BottomSheetViewModel.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt index 70dd2c14..cde47a33 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt @@ -112,10 +112,10 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { private fun initModel() { val row = config?.row - ?: (requireActivity() as? BaseActivity)?.bottomSheetViewModel?.rowRepresentable + ?: (activity as? BaseActivity)?.bottomSheetViewModel?.rowRepresentable ?: throw PAIllegalStateException("row not found") val delegate = config?.delegate - ?: (requireActivity() as? BaseActivity)?.bottomSheetViewModel?.delegate + ?: (activity as? BaseActivity)?.bottomSheetViewModel?.delegate ?: throw PAIllegalStateException("delegate not found") val factory = BottomSheetViewModelFactory(row, delegate) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/BottomSheetViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/BottomSheetViewModel.kt index c98b5ed3..d8302698 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/BottomSheetViewModel.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/BottomSheetViewModel.kt @@ -16,7 +16,7 @@ import java.util.* class BottomSheetViewModelFactory(var row: RowRepresentable, var delegate: RowRepresentableDelegate): ViewModelProvider.Factory { - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return BottomSheetViewModel(row) as T // return modelClass.getConstructor(RowRepresentable::class.java).newInstance(row) }