forked from upstream-mirrors/quik
move conversationlist into activity
This commit is contained in:
@@ -13,7 +13,7 @@
|
|||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/AppTheme">
|
android:theme="@style/AppTheme">
|
||||||
|
|
||||||
<activity android:name=".MainActivity">
|
<activity android:name=".ui.conversations.ConversationListActivity">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package com.moez.QKSMS.dagger
|
package com.moez.QKSMS.dagger
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import com.moez.QKSMS.ui.conversations.ConversationListActivity
|
||||||
import com.moez.QKSMS.data.repository.ConversationRepository
|
import com.moez.QKSMS.data.repository.ConversationRepository
|
||||||
import com.moez.QKSMS.ui.conversations.ConversationListFragment
|
|
||||||
import dagger.Component
|
import dagger.Component
|
||||||
import javax.inject.Singleton
|
import javax.inject.Singleton
|
||||||
|
|
||||||
@@ -10,7 +10,7 @@ import javax.inject.Singleton
|
|||||||
@Component(modules = arrayOf(AppModule::class, ContactModule::class, ConversationsModule::class))
|
@Component(modules = arrayOf(AppModule::class, ContactModule::class, ConversationsModule::class))
|
||||||
interface AppComponent {
|
interface AppComponent {
|
||||||
|
|
||||||
fun inject(fragment: ConversationListFragment)
|
fun inject(activity: ConversationListActivity)
|
||||||
|
|
||||||
fun provideContext(): Context
|
fun provideContext(): Context
|
||||||
fun provideConversationRepository(): ConversationRepository
|
fun provideConversationRepository(): ConversationRepository
|
||||||
|
|||||||
+21
-6
@@ -1,7 +1,8 @@
|
|||||||
package com.moez.QKSMS
|
package com.moez.QKSMS.ui.conversations
|
||||||
|
|
||||||
import android.Manifest
|
import android.Manifest
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
|
import android.support.v7.widget.LinearLayoutManager
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import com.karumi.dexter.Dexter
|
import com.karumi.dexter.Dexter
|
||||||
import com.karumi.dexter.PermissionToken
|
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.PermissionGrantedResponse
|
||||||
import com.karumi.dexter.listener.PermissionRequest
|
import com.karumi.dexter.listener.PermissionRequest
|
||||||
import com.karumi.dexter.listener.single.PermissionListener
|
import com.karumi.dexter.listener.single.PermissionListener
|
||||||
|
import com.moez.QKSMS.R
|
||||||
import com.moez.QKSMS.ui.base.QkActivity
|
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"
|
val TAG = "MainActivity"
|
||||||
|
|
||||||
|
@Inject lateinit var viewModel: ConversationListViewModel
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
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)
|
Dexter.withActivity(this)
|
||||||
.withPermission(Manifest.permission.READ_SMS)
|
.withPermission(Manifest.permission.READ_SMS)
|
||||||
.withListener(object : PermissionListener {
|
.withListener(object : PermissionListener {
|
||||||
@@ -34,7 +51,5 @@ class MainActivity : QkActivity() {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.check()
|
.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)
|
syncManager.copyToRealm(completionListener::invoke)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onCleared() {
|
||||||
|
super.onCleared()
|
||||||
|
conversations.removeAllChangeListeners()
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
tools:context="com.moez.QKSMS.MainActivity">
|
|
||||||
|
|
||||||
<FrameLayout
|
|
||||||
android:id="@+id/contentFrame"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<menu>
|
|
||||||
|
|
||||||
</menu>
|
|
||||||
Reference in New Issue
Block a user