From e0e50c98f36f5fbee016f2194168afd91d73c3b8 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 31 Jul 2018 00:16:52 -0400 Subject: [PATCH] Fix crash when returning to theme selector --- .../com/moez/QKSMS/common/base/QkController.kt | 15 ++++++++++----- .../QKSMS/feature/settings/SettingsController.kt | 14 ++++++++------ .../feature/settings/about/AboutController.kt | 6 ++++-- .../settings/swipe/SwipeActionsController.kt | 14 ++++++++------ .../feature/themepicker/ThemePagerAdapter.kt | 3 +++ .../feature/themepicker/ThemePickerController.kt | 14 ++++++++------ 6 files changed, 41 insertions(+), 25 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkController.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkController.kt index 60c6047e..c3525802 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkController.kt @@ -21,14 +21,19 @@ abstract class QkController, State, Present private val appCompatActivity: AppCompatActivity? get() = activity as? AppCompatActivity - override val containerView: View? - get() = view + override var containerView: View? = null @LayoutRes var layoutRes: Int = 0 - final override fun onCreateView(inflater: LayoutInflater, container: ViewGroup): View { - return inflater.inflate(layoutRes, container, false) + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup): View { + return inflater.inflate(layoutRes, container, false).also { + containerView = it + onViewCreated() + } + } + + open fun onViewCreated() { } fun setTitle(@StringRes titleId: Int) { @@ -45,7 +50,7 @@ abstract class QkController, State, Present } override fun onDestroyView(view: View) { - super.onDestroyView(view) + containerView = null clearFindViewByIdCache() } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt index 5984699e..31eba740 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt @@ -67,12 +67,7 @@ class SettingsController : QkController = (0 until preferences.childCount) .map { index -> preferences.getChildAt(index) } .mapNotNull { view -> view as? PreferenceView } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutController.kt index a8301b0f..bc3bff57 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutController.kt @@ -20,13 +20,15 @@ class AboutController : QkController(), AboutVi layoutRes = R.layout.about_controller } + override fun onViewCreated() { + version.summary = BuildConfig.VERSION_NAME + } + override fun onAttach(view: View) { super.onAttach(view) presenter.bindIntents(this) setTitle(R.string.about_title) showBackButton(true) - - version.summary = BuildConfig.VERSION_NAME } override fun preferenceClicks(): Observable = (0 until preferences.childCount) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt index ccfa194a..fbf72795 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt @@ -54,12 +54,7 @@ class SwipeActionsController : QkController rightIcon.setBackgroundTint(theme.theme) rightIcon.setTint(theme.textPrimary) @@ -77,6 +72,13 @@ class SwipeActionsController : QkController = actionClicks override fun actionSelected(): Observable = actionsDialog.adapter.menuItemClicks diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt index 9ad5e6a5..c7185c21 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt @@ -45,6 +45,9 @@ class ThemePagerAdapter @Inject constructor(private val context: Context) : Page return view == `object` } + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + } + override fun getCount(): Int { return 2 } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerController.kt index fed51e71..699967c7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerController.kt @@ -56,12 +56,7 @@ class ThemePickerController(val threadId: Long = 0L) : QkController