forked from upstream-mirrors/quik
Use constructor injection for ViewModels
This commit is contained in:
@@ -20,8 +20,6 @@ package common
|
||||
|
||||
import android.app.Activity
|
||||
import android.app.ActivityOptions
|
||||
import android.arch.lifecycle.ViewModel
|
||||
import android.arch.lifecycle.ViewModelProvider
|
||||
import android.content.ActivityNotFoundException
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
@@ -33,25 +31,14 @@ import android.provider.Telephony
|
||||
import android.view.View
|
||||
import com.moez.QKSMS.BuildConfig
|
||||
import feature.blocked.BlockedActivity
|
||||
import feature.blocked.BlockedViewModel
|
||||
import feature.compose.ComposeActivity
|
||||
import feature.compose.ComposeViewModel
|
||||
import feature.conversationinfo.ConversationInfoActivity
|
||||
import feature.conversationinfo.ConversationInfoViewModel
|
||||
import feature.gallery.GalleryActivity
|
||||
import feature.gallery.GalleryViewModel
|
||||
import feature.main.MainViewModel
|
||||
import feature.notificationprefs.NotificationPrefsActivity
|
||||
import feature.notificationprefs.NotificationPrefsViewModel
|
||||
import feature.plus.PlusActivity
|
||||
import feature.plus.PlusViewModel
|
||||
import feature.qkreply.QkReplyViewModel
|
||||
import feature.settings.SettingsActivity
|
||||
import feature.settings.SettingsViewModel
|
||||
import feature.settings.about.AboutActivity
|
||||
import feature.settings.about.AboutViewModel
|
||||
import feature.themepicker.ThemePickerActivity
|
||||
import feature.themepicker.ThemePickerViewModel
|
||||
import manager.NotificationManager
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
@@ -248,25 +235,4 @@ class Navigator @Inject constructor(private val context: Context, private val no
|
||||
}
|
||||
}
|
||||
|
||||
class ViewModelFactory(private val intent: Intent) : ViewModelProvider.Factory {
|
||||
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
|
||||
return when (modelClass) {
|
||||
MainViewModel::class.java -> MainViewModel()
|
||||
PlusViewModel::class.java -> PlusViewModel()
|
||||
AboutViewModel::class.java -> AboutViewModel()
|
||||
ComposeViewModel::class.java -> ComposeViewModel(intent)
|
||||
ConversationInfoViewModel::class.java -> ConversationInfoViewModel(intent)
|
||||
GalleryViewModel::class.java -> GalleryViewModel(intent)
|
||||
NotificationPrefsViewModel::class.java -> NotificationPrefsViewModel(intent)
|
||||
QkReplyViewModel::class.java -> QkReplyViewModel(intent)
|
||||
SettingsViewModel::class.java -> SettingsViewModel()
|
||||
BlockedViewModel::class.java -> BlockedViewModel()
|
||||
ThemePickerViewModel::class.java -> ThemePickerViewModel(intent)
|
||||
else -> throw IllegalArgumentException("Invalid ViewModel class. If this is a new ViewModel, please add it to Navigator.kt")
|
||||
} as T
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -18,6 +18,7 @@ package common
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
import android.app.Activity
|
||||
import android.app.Application
|
||||
import android.support.text.emoji.EmojiCompat
|
||||
import android.support.text.emoji.FontRequestEmojiCompatConfig
|
||||
@@ -27,6 +28,9 @@ import com.bugsnag.android.Configuration
|
||||
import com.moez.QKSMS.BuildConfig
|
||||
import com.moez.QKSMS.R
|
||||
import common.util.NightModeManager
|
||||
import dagger.android.AndroidInjector
|
||||
import dagger.android.DispatchingAndroidInjector
|
||||
import dagger.android.HasActivityInjector
|
||||
import injection.AppComponentManager
|
||||
import injection.appComponent
|
||||
import io.realm.Realm
|
||||
@@ -36,7 +40,7 @@ import migration.QkRealmMigration
|
||||
import timber.log.Timber
|
||||
import javax.inject.Inject
|
||||
|
||||
class QKApplication : Application() {
|
||||
class QKApplication : Application(), HasActivityInjector {
|
||||
|
||||
/**
|
||||
* Inject this so that it is forced to initialize
|
||||
@@ -44,6 +48,7 @@ class QKApplication : Application() {
|
||||
@Suppress("unused")
|
||||
@Inject lateinit var analyticsManager: AnalyticsManager
|
||||
|
||||
@Inject lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
|
||||
@Inject lateinit var nightModeManager: NightModeManager
|
||||
|
||||
override fun onCreate() {
|
||||
@@ -76,4 +81,8 @@ class QKApplication : Application() {
|
||||
Timber.plant(Timber.DebugTree())
|
||||
}
|
||||
|
||||
override fun activityInjector(): AndroidInjector<Activity> {
|
||||
return dispatchingAndroidInjector
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package common
|
||||
|
||||
import android.arch.lifecycle.ViewModel
|
||||
import android.arch.lifecycle.ViewModelProvider
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Provider
|
||||
|
||||
class ViewModelFactory @Inject constructor(private val viewModels: MutableMap<Class<out ViewModel>, Provider<ViewModel>>) : ViewModelProvider.Factory {
|
||||
|
||||
override fun <T : ViewModel> create(modelClass: Class<T>): T = viewModels[modelClass]?.get() as T
|
||||
|
||||
}
|
||||
@@ -19,23 +19,15 @@
|
||||
package common.base
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.arch.lifecycle.ViewModelProviders
|
||||
import android.os.Bundle
|
||||
import android.support.v7.app.AppCompatActivity
|
||||
import android.view.Menu
|
||||
import android.view.MenuItem
|
||||
import common.Navigator
|
||||
import io.reactivex.subjects.BehaviorSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.toolbar.*
|
||||
import kotlin.reflect.KClass
|
||||
|
||||
abstract class QkActivity<VM : QkViewModel<*, *>> : AppCompatActivity() {
|
||||
|
||||
protected abstract val viewModelClass: KClass<VM>
|
||||
protected val viewModel: VM by lazy {
|
||||
ViewModelProviders.of(this, Navigator.ViewModelFactory(intent))[viewModelClass.java]
|
||||
}
|
||||
abstract class QkActivity : AppCompatActivity() {
|
||||
|
||||
protected val menu: Subject<Menu> = BehaviorSubject.create()
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ import javax.inject.Inject
|
||||
* In most cases, this should be used instead of the base QkActivity, except for when
|
||||
* an activity does not depend on the theme
|
||||
*/
|
||||
abstract class QkThemedActivity<VM : QkViewModel<*, *>> : QkActivity<VM>() {
|
||||
abstract class QkThemedActivity : QkActivity() {
|
||||
|
||||
@Inject lateinit var colors: Colors
|
||||
|
||||
|
||||
Reference in New Issue
Block a user