From 52870d02fd5be8ace8c9e67a52651e4b4c15b99f Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 28 Nov 2017 02:24:12 -0500 Subject: [PATCH] Don't require State as a type parameter for an Activity --- .../main/java/com/moez/QKSMS/presentation/base/QkActivity.kt | 2 +- .../java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt | 2 +- .../main/java/com/moez/QKSMS/presentation/main/MainActivity.kt | 2 +- .../com/moez/QKSMS/presentation/messages/MessagesActivity.kt | 2 +- .../com/moez/QKSMS/presentation/settings/SettingsActivity.kt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt index e209ca14..4281c211 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt @@ -8,7 +8,7 @@ import com.moez.QKSMS.presentation.Navigator import kotlinx.android.synthetic.main.toolbar.* import kotlin.reflect.KClass -abstract class QkActivity, State> : AppCompatActivity(), QkView { +abstract class QkActivity> : AppCompatActivity() { protected abstract val viewModelClass: KClass protected val viewModel: VM by lazy { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt index 5a45a7ae..a9748373 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt @@ -11,7 +11,7 @@ import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.compose_activity.* import kotlinx.android.synthetic.main.toolbar_chips.* -class ComposeActivity : QkActivity(), ComposeView { +class ComposeActivity : QkActivity(), ComposeView { override val viewModelClass = ComposeViewModel::class diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt index 382fb924..3c740225 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt @@ -27,7 +27,7 @@ import kotlinx.android.synthetic.main.toolbar.* import timber.log.Timber import javax.inject.Inject -class MainActivity : QkActivity(), MainView { +class MainActivity : QkActivity(), MainView { @Inject lateinit var navigator: Navigator @Inject lateinit var themeManager: ThemeManager diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt index 3d0ffbac..215145e5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt @@ -19,7 +19,7 @@ import kotlinx.android.synthetic.main.message_list_activity.* import javax.inject.Inject -class MessagesActivity : QkActivity(), MessagesView { +class MessagesActivity : QkActivity(), MessagesView { @Inject lateinit var themeManager: ThemeManager diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt index bcdf4f69..5efb107a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt @@ -6,7 +6,7 @@ import com.moez.QKSMS.R import com.moez.QKSMS.presentation.base.QkActivity import kotlinx.android.synthetic.main.settings_activity.* -class SettingsActivity : QkActivity(), SettingsView { +class SettingsActivity : QkActivity(), SettingsView { override val viewModelClass = SettingsViewModel::class override val preferenceClickIntent by lazy { fragment.preferenceClicks }