forked from upstream-mirrors/quik
move conversationlist into activity
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
package com.moez.QKSMS.dagger
|
||||
|
||||
import android.content.Context
|
||||
import com.moez.QKSMS.ui.conversations.ConversationListActivity
|
||||
import com.moez.QKSMS.data.repository.ConversationRepository
|
||||
import com.moez.QKSMS.ui.conversations.ConversationListFragment
|
||||
import dagger.Component
|
||||
import javax.inject.Singleton
|
||||
|
||||
@@ -10,7 +10,7 @@ import javax.inject.Singleton
|
||||
@Component(modules = arrayOf(AppModule::class, ContactModule::class, ConversationsModule::class))
|
||||
interface AppComponent {
|
||||
|
||||
fun inject(fragment: ConversationListFragment)
|
||||
fun inject(activity: ConversationListActivity)
|
||||
|
||||
fun provideContext(): Context
|
||||
fun provideConversationRepository(): ConversationRepository
|
||||
|
||||
+21
-6
@@ -1,7 +1,8 @@
|
||||
package com.moez.QKSMS
|
||||
package com.moez.QKSMS.ui.conversations
|
||||
|
||||
import android.Manifest
|
||||
import android.os.Bundle
|
||||
import android.support.v7.widget.LinearLayoutManager
|
||||
import android.util.Log
|
||||
import com.karumi.dexter.Dexter
|
||||
import com.karumi.dexter.PermissionToken
|
||||
@@ -9,16 +10,32 @@ import com.karumi.dexter.listener.PermissionDeniedResponse
|
||||
import com.karumi.dexter.listener.PermissionGrantedResponse
|
||||
import com.karumi.dexter.listener.PermissionRequest
|
||||
import com.karumi.dexter.listener.single.PermissionListener
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.ui.base.QkActivity
|
||||
import com.moez.QKSMS.ui.conversations.ConversationListFragment
|
||||
import kotlinx.android.synthetic.main.conversation_list_activity.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class MainActivity : QkActivity() {
|
||||
class ConversationListActivity : QkActivity() {
|
||||
val TAG = "MainActivity"
|
||||
|
||||
@Inject lateinit var viewModel: ConversationListViewModel
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.conversation_list_fragment)
|
||||
setContentView(R.layout.conversation_list_activity)
|
||||
getAppComponent()?.inject(this)
|
||||
|
||||
conversationList.layoutManager = LinearLayoutManager(this)
|
||||
conversationList.adapter = ConversationAdapter(this, viewModel.conversations)
|
||||
|
||||
swipeRefresh.setOnRefreshListener {
|
||||
viewModel.onRefresh { swipeRefresh.isRefreshing = false }
|
||||
}
|
||||
|
||||
requestSmsPermission()
|
||||
}
|
||||
|
||||
private fun requestSmsPermission() {
|
||||
Dexter.withActivity(this)
|
||||
.withPermission(Manifest.permission.READ_SMS)
|
||||
.withListener(object : PermissionListener {
|
||||
@@ -34,7 +51,5 @@ class MainActivity : QkActivity() {
|
||||
}
|
||||
})
|
||||
.check()
|
||||
|
||||
supportFragmentManager.beginTransaction().replace(R.id.contentFrame, ConversationListFragment()).commit()
|
||||
}
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
package com.moez.QKSMS.ui.conversations
|
||||
|
||||
import android.os.Bundle
|
||||
import android.support.v7.widget.LinearLayoutManager
|
||||
import android.view.View
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.ui.base.QkFragment
|
||||
import kotlinx.android.synthetic.main.conversation_list_fragment.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class ConversationListFragment : QkFragment() {
|
||||
|
||||
@Inject lateinit var viewModel: ConversationListViewModel
|
||||
|
||||
override fun provideLayoutRes(): Int = R.layout.conversation_list_fragment
|
||||
override fun provideMenuRes(): Int = R.menu.conversations
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
context.getAppComponent()?.inject(this)
|
||||
}
|
||||
|
||||
override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
|
||||
conversationList.layoutManager = LinearLayoutManager(context)
|
||||
conversationList.adapter = ConversationAdapter(context, viewModel.conversations)
|
||||
|
||||
swipeRefresh.setOnRefreshListener {
|
||||
viewModel.onRefresh { swipeRefresh.isRefreshing = false }
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -12,4 +12,9 @@ class ConversationListViewModel(val syncManager: SyncManager, repository: Conver
|
||||
syncManager.copyToRealm(completionListener::invoke)
|
||||
}
|
||||
|
||||
override fun onCleared() {
|
||||
super.onCleared()
|
||||
conversations.removeAllChangeListeners()
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user