From daaf62f18a772cc014ab58019ca8a5dfb39280dd Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 28 Aug 2017 15:58:20 -0700 Subject: [PATCH] use activity to display messagelist --- .../main/java/com/moez/QKSMS/MainActivity.kt | 2 +- .../moez/QKSMS/dagger/MessagesComponent.kt | 4 ++-- .../java/com/moez/QKSMS/ui/base/QkActivity.kt | 10 ++++++++- .../QKSMS/ui/messages/MessageListActivity.kt | 21 +++++++++++++------ 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt index 5ba01252..5d743bb5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt @@ -17,7 +17,7 @@ class MainActivity : QkActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.base_activity) + setContentView(R.layout.conversation_list_fragment) Dexter.withActivity(this) .withPermission(Manifest.permission.READ_SMS) diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesComponent.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesComponent.kt index 6da6d897..c1b80de4 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/MessagesComponent.kt @@ -1,12 +1,12 @@ package com.moez.QKSMS.dagger -import com.moez.QKSMS.ui.messages.MessageListFragment +import com.moez.QKSMS.ui.messages.MessageListActivity import dagger.Component @ActivityScope @Component(dependencies = arrayOf(AppComponent::class), modules = arrayOf(MessagesModule::class)) interface MessagesComponent { - fun inject(fragment: MessageListFragment) + fun inject(activity: MessageListActivity) } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt index 4cb16720..558c50c9 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt @@ -1,11 +1,19 @@ package com.moez.QKSMS.ui.base +import android.arch.lifecycle.LifecycleRegistry +import android.arch.lifecycle.LifecycleRegistryOwner import android.support.v7.app.AppCompatActivity import android.view.MenuItem import com.moez.QKSMS.QKApplication import com.moez.QKSMS.dagger.AppComponent -abstract class QkActivity : AppCompatActivity() { +abstract class QkActivity : AppCompatActivity(), LifecycleRegistryOwner { + + private val mRegistry = LifecycleRegistry(this) + + override fun getLifecycle(): LifecycleRegistry { + return mRegistry + } fun getAppComponent(): AppComponent? { return (application as QKApplication).appComponent diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt index 19548330..bc963427 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt @@ -1,29 +1,38 @@ package com.moez.QKSMS.ui.messages import android.os.Bundle +import android.support.v7.widget.LinearLayoutManager import com.moez.QKSMS.R import com.moez.QKSMS.dagger.DaggerMessagesComponent import com.moez.QKSMS.dagger.MessagesModule import com.moez.QKSMS.ui.base.QkActivity +import kotlinx.android.synthetic.main.message_list_activity.* +import javax.inject.Inject class MessageListActivity : QkActivity() { + @Inject lateinit var viewModel: MessageListViewModel + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.base_activity) + setContentView(R.layout.message_list_activity) supportActionBar?.setDisplayHomeAsUpEnabled(true) val threadId = intent.getLongExtra("thread_id", 0) - - val messagesComponent = DaggerMessagesComponent.builder() + DaggerMessagesComponent.builder() .appComponent(getAppComponent()) .messagesModule(MessagesModule(threadId)) .build() + .inject(this) - val fragment = MessageListFragment() - messagesComponent.inject(fragment) + viewModel.conversation.addChangeListener { realmResults -> + title = realmResults[0]?.getTitle() + } - supportFragmentManager.beginTransaction().replace(R.id.contentFrame, fragment).commit() + val layoutManager = LinearLayoutManager(this) + layoutManager.stackFromEnd = true + messageList.layoutManager = layoutManager + messageList.adapter = MessageAdapter(this, viewModel.messages) } } \ No newline at end of file