diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt index a18dd054..79324f1e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt @@ -1,11 +1,30 @@ package com.moez.QKSMS.ui.base import android.arch.lifecycle.LifecycleFragment +import android.os.Bundle +import android.view.* import com.moez.QKSMS.QKApplication import com.moez.QKSMS.dagger.AppComponent abstract class QkFragment : LifecycleFragment() { + abstract fun provideLayoutRes(): Int + open fun provideMenuRes(): Int = 0 + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setHasOptionsMenu(provideMenuRes() != 0) + } + + final override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { + return inflater.inflate(provideLayoutRes(), container, false) + } + + final override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { + if (provideMenuRes() != 0) inflater.inflate(provideMenuRes(), menu) + super.onCreateOptionsMenu(menu, inflater) + } + override fun getContext(): QkActivity { return super.getContext() as QkActivity } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt index 8e1bffaa..28af75ad 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt @@ -2,7 +2,8 @@ package com.moez.QKSMS.ui.conversations import android.os.Bundle import android.support.v7.widget.LinearLayoutManager -import android.view.* +import android.view.MenuItem +import android.view.View import com.moez.QKSMS.R import com.moez.QKSMS.data.sync.SyncManager import com.moez.QKSMS.ui.base.QkFragment @@ -13,14 +14,12 @@ 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) getAppComponent()?.inject(this) - setHasOptionsMenu(true) - } - - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - return inflater.inflate(R.layout.conversation_list_fragment, container, false) } override fun onViewCreated(view: View?, savedInstanceState: Bundle?) { @@ -28,11 +27,6 @@ class ConversationListFragment : QkFragment() { conversationList.adapter = ConversationAdapter(context, viewModel.conversations) } - override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - inflater.inflate(R.menu.conversations, menu) - super.onCreateOptionsMenu(menu, inflater) - } - override fun onOptionsItemSelected(item: MenuItem): Boolean { return when (item.itemId) { R.id.load_conversations -> { // TODO: This is for testing, remove this diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListFragment.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListFragment.kt index 10ad6106..4766091a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListFragment.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListFragment.kt @@ -2,7 +2,8 @@ package com.moez.QKSMS.ui.messages import android.os.Bundle import android.support.v7.widget.LinearLayoutManager -import android.view.* +import android.view.MenuItem +import android.view.View import com.moez.QKSMS.R import com.moez.QKSMS.ui.base.QkFragment import kotlinx.android.synthetic.main.message_list_fragment.* @@ -12,14 +13,8 @@ class MessageListFragment : QkFragment() { @Inject lateinit var viewModel: MessageListViewModel - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setHasOptionsMenu(true) - } - - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { - return inflater.inflate(R.layout.message_list_fragment, container, false) - } + override fun provideLayoutRes(): Int = R.layout.message_list_fragment + override fun provideMenuRes(): Int = R.menu.messages override fun onViewCreated(view: View?, savedInstanceState: Bundle?) { val layoutManager = LinearLayoutManager(context) @@ -28,11 +23,6 @@ class MessageListFragment : QkFragment() { messageList.adapter = MessageAdapter(context, viewModel.messages) } - override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - inflater.inflate(R.menu.messages, menu) - super.onCreateOptionsMenu(menu, inflater) - } - override fun onOptionsItemSelected(item: MenuItem): Boolean { return when (item.itemId) { else -> super.onOptionsItemSelected(item)