diff --git a/qksms/build.gradle b/qksms/build.gradle
index a71503fc..26cbd848 100644
--- a/qksms/build.gradle
+++ b/qksms/build.gradle
@@ -1,6 +1,7 @@
apply plugin: 'com.android.application'
apply plugin: 'realm-android' // Realm needs to be before Kotlin or the build will fail
apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion 26
diff --git a/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt
index 725a381c..5ba01252 100644
--- a/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt
@@ -35,6 +35,6 @@ class MainActivity : QkActivity() {
})
.check()
- supportFragmentManager.beginTransaction().replace(R.id.content_frame, ConversationListFragment()).commit()
+ supportFragmentManager.beginTransaction().replace(R.id.contentFrame, ConversationListFragment()).commit()
}
}
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 e66f035e..9dabdc99 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,21 +2,17 @@ package com.moez.QKSMS.ui.conversations
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
import android.view.*
-import android.widget.ProgressBar
import com.moez.QKSMS.R
import com.moez.QKSMS.data.sync.SyncManager
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
- private var progress: ProgressBar? = null
- private var conversationList: RecyclerView? = null
-
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
getAppComponent()?.inject(this)
@@ -26,11 +22,8 @@ class ConversationListFragment : QkFragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
val view = inflater.inflate(R.layout.conversation_list_fragment, container, false)
- progress = view.findViewById(R.id.conversation_progress)
-
- conversationList = view.findViewById(R.id.conversation_list)
- conversationList?.layoutManager = LinearLayoutManager(context)
- conversationList?.adapter = ConversationAdapter(context, viewModel.conversations)
+ conversationList.layoutManager = LinearLayoutManager(context)
+ conversationList.adapter = ConversationAdapter(context, viewModel.conversations)
return view
}
@@ -43,9 +36,9 @@ class ConversationListFragment : QkFragment() {
override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when (item.itemId) {
R.id.load_conversations -> { // TODO: This is for testing, remove this
- progress?.visibility = View.VISIBLE
+ progress.visibility = View.VISIBLE
SyncManager.copyToRealm(context) {
- progress?.visibility = View.GONE
+ progress.visibility = View.GONE
}
true
}
diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationViewHolder.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationViewHolder.kt
index 193a578e..5a88c605 100644
--- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationViewHolder.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationViewHolder.kt
@@ -7,7 +7,7 @@ import com.moez.QKSMS.R
class ConversationViewHolder(view: View) : RecyclerView.ViewHolder(view) {
- val title: TextView = view.findViewById(R.id.conversation_title)
- val snippet: TextView = view.findViewById(R.id.conversation_snippet)
+ val title: TextView = view.findViewById(R.id.title)
+ val snippet: TextView = view.findViewById(R.id.snippet)
}
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 76c383c0..f4474ebe 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
@@ -22,7 +22,7 @@ class MessageListActivity : QkActivity() {
val fragment = MessageListFragment()
messagesComponent.inject(fragment)
- supportFragmentManager.beginTransaction().replace(R.id.content_frame, fragment).commit()
+ supportFragmentManager.beginTransaction().replace(R.id.contentFrame, fragment).commit()
}
}
\ No newline at end of file
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 5da99055..596f9c6a 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,18 +2,16 @@ package com.moez.QKSMS.ui.messages
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
import android.view.*
import com.moez.QKSMS.R
import com.moez.QKSMS.ui.base.QkFragment
+import kotlinx.android.synthetic.main.message_list_fragment.*
import javax.inject.Inject
class MessageListFragment : QkFragment() {
@Inject lateinit var viewModel: MessageListViewModel
- private var messageList: RecyclerView? = null
-
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setHasOptionsMenu(true)
@@ -22,12 +20,10 @@ class MessageListFragment : QkFragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
val view = inflater.inflate(R.layout.message_list_fragment, container, false)
- messageList = view.findViewById(R.id.message_list)
-
val layoutManager = LinearLayoutManager(context)
layoutManager.stackFromEnd = true
- messageList?.layoutManager = layoutManager
- messageList?.adapter = MessageAdapter(context, viewModel.messages)
+ messageList.layoutManager = layoutManager
+ messageList.adapter = MessageAdapter(context, viewModel.messages)
return view
}
diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt
index 37ff0d6a..8d14ebb9 100644
--- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt
@@ -7,6 +7,6 @@ import com.moez.QKSMS.R
class MessageViewHolder(view: View) : RecyclerView.ViewHolder(view) {
- val body: TextView = view.findViewById(R.id.message_body)
+ val body: TextView = view.findViewById(R.id.body)
}
\ No newline at end of file
diff --git a/qksms/src/main/res/layout/base_activity.xml b/qksms/src/main/res/layout/base_activity.xml
index b862a620..f5c67aac 100644
--- a/qksms/src/main/res/layout/base_activity.xml
+++ b/qksms/src/main/res/layout/base_activity.xml
@@ -6,7 +6,7 @@
tools:context="com.moez.QKSMS.MainActivity">
diff --git a/qksms/src/main/res/layout/conversation_list_fragment.xml b/qksms/src/main/res/layout/conversation_list_fragment.xml
index 1095da34..0f48768b 100644
--- a/qksms/src/main/res/layout/conversation_list_fragment.xml
+++ b/qksms/src/main/res/layout/conversation_list_fragment.xml
@@ -7,7 +7,7 @@
android:orientation="vertical">
\ No newline at end of file
diff --git a/qksms/src/main/res/layout/message_list_fragment.xml b/qksms/src/main/res/layout/message_list_fragment.xml
index b36434eb..f54844fe 100644
--- a/qksms/src/main/res/layout/message_list_fragment.xml
+++ b/qksms/src/main/res/layout/message_list_fragment.xml
@@ -6,7 +6,7 @@
android:orientation="vertical">