mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 19:38:52 +01:00
Don't require State as a type parameter for an Activity
This commit is contained in:
@@ -8,7 +8,7 @@ import com.moez.QKSMS.presentation.Navigator
|
||||
import kotlinx.android.synthetic.main.toolbar.*
|
||||
import kotlin.reflect.KClass
|
||||
|
||||
abstract class QkActivity<VM : QkViewModel<*, State>, State> : AppCompatActivity(), QkView<State> {
|
||||
abstract class QkActivity<VM : QkViewModel<*, *>> : AppCompatActivity() {
|
||||
|
||||
protected abstract val viewModelClass: KClass<VM>
|
||||
protected val viewModel: VM by lazy {
|
||||
|
||||
@@ -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<ComposeViewModel, ComposeState>(), ComposeView {
|
||||
class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
|
||||
|
||||
override val viewModelClass = ComposeViewModel::class
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ import kotlinx.android.synthetic.main.toolbar.*
|
||||
import timber.log.Timber
|
||||
import javax.inject.Inject
|
||||
|
||||
class MainActivity : QkActivity<MainViewModel, MainState>(), MainView {
|
||||
class MainActivity : QkActivity<MainViewModel>(), MainView {
|
||||
|
||||
@Inject lateinit var navigator: Navigator
|
||||
@Inject lateinit var themeManager: ThemeManager
|
||||
|
||||
@@ -19,7 +19,7 @@ import kotlinx.android.synthetic.main.message_list_activity.*
|
||||
import javax.inject.Inject
|
||||
|
||||
|
||||
class MessagesActivity : QkActivity<MessagesViewModel, MessagesState>(), MessagesView {
|
||||
class MessagesActivity : QkActivity<MessagesViewModel>(), MessagesView {
|
||||
|
||||
@Inject lateinit var themeManager: ThemeManager
|
||||
|
||||
|
||||
@@ -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<SettingsViewModel, SettingsState>(), SettingsView {
|
||||
class SettingsActivity : QkActivity<SettingsViewModel>(), SettingsView {
|
||||
|
||||
override val viewModelClass = SettingsViewModel::class
|
||||
override val preferenceClickIntent by lazy { fragment.preferenceClicks }
|
||||
|
||||
Reference in New Issue
Block a user