forked from upstream-mirrors/quik
use dependency injection for conversation viewmodel
This commit is contained in:
@@ -38,6 +38,7 @@ dependencies {
|
|||||||
compile 'com.android.support:appcompat-v7:26.0.0'
|
compile 'com.android.support:appcompat-v7:26.0.0'
|
||||||
compile 'com.android.support.constraint:constraint-layout:1.0.2'
|
compile 'com.android.support.constraint:constraint-layout:1.0.2'
|
||||||
compile 'com.bugsnag:bugsnag-android:3.9.0'
|
compile 'com.bugsnag:bugsnag-android:3.9.0'
|
||||||
|
compile "com.google.dagger:dagger:2.9"
|
||||||
compile 'com.karumi:dexter:4.1.0'
|
compile 'com.karumi:dexter:4.1.0'
|
||||||
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
|
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
|
||||||
compile "io.reactivex.rxjava2:rxjava:2.1.0"
|
compile "io.reactivex.rxjava2:rxjava:2.1.0"
|
||||||
@@ -45,6 +46,12 @@ dependencies {
|
|||||||
compile 'io.realm:android-adapters:1.3.0'
|
compile 'io.realm:android-adapters:1.3.0'
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
|
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
|
||||||
kapt "android.arch.lifecycle:compiler:1.0.0-alpha9"
|
kapt "android.arch.lifecycle:compiler:1.0.0-alpha9"
|
||||||
|
kapt "com.google.dagger:dagger-compiler:2.9"
|
||||||
kapt 'io.realm:realm-annotations:3.3.1'
|
kapt 'io.realm:realm-annotations:3.3.1'
|
||||||
kapt 'io.realm:realm-annotations-processor:3.3.1'
|
kapt 'io.realm:realm-annotations-processor:3.3.1'
|
||||||
|
provided 'javax.annotation:jsr250-api:1.0'
|
||||||
|
}
|
||||||
|
|
||||||
|
kapt {
|
||||||
|
generateStubs = true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,11 +2,19 @@ package com.moez.QKSMS
|
|||||||
|
|
||||||
import android.app.Application
|
import android.app.Application
|
||||||
import com.bugsnag.android.Bugsnag
|
import com.bugsnag.android.Bugsnag
|
||||||
|
import com.moez.QKSMS.dagger.AppComponent
|
||||||
|
import com.moez.QKSMS.dagger.AppModule
|
||||||
|
import com.moez.QKSMS.dagger.ConversationModule
|
||||||
|
import com.moez.QKSMS.dagger.DaggerAppComponent
|
||||||
import io.realm.Realm
|
import io.realm.Realm
|
||||||
import io.realm.RealmConfiguration
|
import io.realm.RealmConfiguration
|
||||||
|
|
||||||
|
|
||||||
class QKApplication : Application() {
|
class QKApplication : Application() {
|
||||||
|
|
||||||
|
var appComponent: AppComponent? = null
|
||||||
|
private set
|
||||||
|
|
||||||
override fun onCreate() {
|
override fun onCreate() {
|
||||||
super.onCreate()
|
super.onCreate()
|
||||||
|
|
||||||
@@ -16,6 +24,11 @@ class QKApplication : Application() {
|
|||||||
Realm.setDefaultConfiguration(RealmConfiguration.Builder()
|
Realm.setDefaultConfiguration(RealmConfiguration.Builder()
|
||||||
.deleteRealmIfMigrationNeeded()
|
.deleteRealmIfMigrationNeeded()
|
||||||
.build())
|
.build())
|
||||||
|
|
||||||
|
appComponent = DaggerAppComponent.builder()
|
||||||
|
.appModule(AppModule(this))
|
||||||
|
.conversationModule(ConversationModule())
|
||||||
|
.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,13 @@
|
|||||||
package com.moez.QKSMS.dagger
|
package com.moez.QKSMS.dagger
|
||||||
|
|
||||||
/**
|
import com.moez.QKSMS.ui.conversations.ConversationListFragment
|
||||||
* Created by moez on 2017-08-28.
|
import dagger.Component
|
||||||
*/
|
import javax.inject.Singleton
|
||||||
|
|
||||||
|
@Singleton
|
||||||
|
@Component(modules = arrayOf(AppModule::class, ConversationModule::class))
|
||||||
|
interface AppComponent {
|
||||||
|
|
||||||
|
fun inject(fragment: ConversationListFragment)
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,5 +1,18 @@
|
|||||||
package com.moez.QKSMS.dagger
|
package com.moez.QKSMS.dagger
|
||||||
|
|
||||||
/**
|
import android.app.Application
|
||||||
* Created by moez on 2017-08-28.
|
import android.content.Context
|
||||||
*/
|
import dagger.Module
|
||||||
|
import dagger.Provides
|
||||||
|
import javax.inject.Singleton
|
||||||
|
|
||||||
|
@Module
|
||||||
|
class AppModule(var application: Application) {
|
||||||
|
|
||||||
|
@Provides
|
||||||
|
@Singleton
|
||||||
|
fun provideContext(): Context {
|
||||||
|
return application
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,5 +1,24 @@
|
|||||||
package com.moez.QKSMS.dagger
|
package com.moez.QKSMS.dagger
|
||||||
|
|
||||||
/**
|
import com.moez.QKSMS.data.repository.ConversationRepository
|
||||||
* Created by moez on 2017-08-28.
|
import com.moez.QKSMS.ui.conversations.ConversationListViewModel
|
||||||
*/
|
import dagger.Module
|
||||||
|
import dagger.Provides
|
||||||
|
import javax.inject.Singleton
|
||||||
|
|
||||||
|
@Module
|
||||||
|
class ConversationModule {
|
||||||
|
|
||||||
|
@Provides
|
||||||
|
@Singleton
|
||||||
|
fun provideRepository(): ConversationRepository {
|
||||||
|
return ConversationRepository()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Provides
|
||||||
|
@Singleton
|
||||||
|
fun provideViewModel(repository: ConversationRepository): ConversationListViewModel {
|
||||||
|
return ConversationListViewModel(repository)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
package com.moez.QKSMS.ui.base
|
package com.moez.QKSMS.ui.base
|
||||||
|
|
||||||
import android.arch.lifecycle.LifecycleFragment
|
import android.arch.lifecycle.LifecycleFragment
|
||||||
|
import com.moez.QKSMS.QKApplication
|
||||||
|
import com.moez.QKSMS.dagger.AppComponent
|
||||||
|
|
||||||
abstract class QkFragment : LifecycleFragment() {
|
abstract class QkFragment : LifecycleFragment() {
|
||||||
|
|
||||||
@@ -8,4 +10,8 @@ abstract class QkFragment : LifecycleFragment() {
|
|||||||
return super.getContext() as QkActivity
|
return super.getContext() as QkActivity
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun getAppComponent(): AppComponent? {
|
||||||
|
return (context.application as QKApplication).appComponent
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -8,18 +8,19 @@ import android.widget.ProgressBar
|
|||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.moez.QKSMS.data.sync.SyncManager
|
import com.moez.QKSMS.data.sync.SyncManager
|
||||||
import com.moez.QKSMS.ui.base.QkFragment
|
import com.moez.QKSMS.ui.base.QkFragment
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
class ConversationListFragment : QkFragment() {
|
class ConversationListFragment : QkFragment() {
|
||||||
|
|
||||||
|
@Inject lateinit var viewModel: ConversationListViewModel
|
||||||
|
|
||||||
private var progress: ProgressBar? = null
|
private var progress: ProgressBar? = null
|
||||||
private var conversationList: RecyclerView? = null
|
private var conversationList: RecyclerView? = null
|
||||||
private var viewModel: ConversationListViewModel? = null
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
getAppComponent()?.inject(this)
|
||||||
setHasOptionsMenu(true)
|
setHasOptionsMenu(true)
|
||||||
|
|
||||||
viewModel = ConversationListViewModel()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
||||||
@@ -29,7 +30,7 @@ class ConversationListFragment : QkFragment() {
|
|||||||
|
|
||||||
conversationList = view.findViewById(R.id.conversation_list)
|
conversationList = view.findViewById(R.id.conversation_list)
|
||||||
conversationList?.layoutManager = LinearLayoutManager(context)
|
conversationList?.layoutManager = LinearLayoutManager(context)
|
||||||
conversationList?.adapter = ConversationAdapter(context, viewModel?.conversations)
|
conversationList?.adapter = ConversationAdapter(context, viewModel.conversations)
|
||||||
|
|
||||||
return view
|
return view
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,10 +3,8 @@ package com.moez.QKSMS.ui.conversations
|
|||||||
import android.arch.lifecycle.ViewModel
|
import android.arch.lifecycle.ViewModel
|
||||||
import com.moez.QKSMS.data.repository.ConversationRepository
|
import com.moez.QKSMS.data.repository.ConversationRepository
|
||||||
|
|
||||||
class ConversationListViewModel : ViewModel() {
|
class ConversationListViewModel(repository: ConversationRepository) : ViewModel() {
|
||||||
|
|
||||||
private val repository = ConversationRepository()
|
val conversations = repository.getConversations()
|
||||||
|
|
||||||
var conversations = repository.getConversations()
|
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user