diff --git a/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt index f5587ee5..b57f4730 100644 --- a/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt @@ -3,8 +3,6 @@ package com.moez.QKSMS import android.Manifest import android.os.Bundle import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView import android.util.Log import com.karumi.dexter.Dexter import com.karumi.dexter.PermissionToken @@ -13,9 +11,7 @@ import com.karumi.dexter.listener.PermissionGrantedResponse import com.karumi.dexter.listener.PermissionRequest import com.karumi.dexter.listener.single.PermissionListener import com.moez.QKSMS.data.sync.ConversationSyncManager -import com.moez.QKSMS.model.Conversation -import com.moez.QKSMS.ui.conversations.ConversationAdapter -import io.realm.Realm +import com.moez.QKSMS.ui.conversations.ConversationFragment class MainActivity : AppCompatActivity() { val TAG = "MainActivity" @@ -41,10 +37,6 @@ class MainActivity : AppCompatActivity() { }) .check() - val realmResults = Realm.getDefaultInstance().where(Conversation::class.java).findAll() - - val conversations = findViewById(R.id.conversation_list) as RecyclerView - conversations.layoutManager = LinearLayoutManager(this) - conversations.adapter = ConversationAdapter(this, realmResults) + supportFragmentManager.beginTransaction().add(R.id.content_frame, ConversationFragment()).commit() } } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationFragment.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationFragment.kt new file mode 100644 index 00000000..99311db6 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationFragment.kt @@ -0,0 +1,28 @@ +package com.moez.QKSMS.ui.conversations + +import android.os.Bundle +import android.support.v4.app.Fragment +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.moez.QKSMS.R +import com.moez.QKSMS.model.Conversation +import io.realm.Realm + +class ConversationFragment : Fragment() { + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + val view = inflater.inflate(R.layout.conversations_fragment, container, false) + + val realmResults = Realm.getDefaultInstance().where(Conversation::class.java).findAll() + + val conversations = view.findViewById(R.id.conversation_list) as RecyclerView + conversations.layoutManager = LinearLayoutManager(context) + conversations.adapter = ConversationAdapter(context, realmResults) + + return view + } + +} \ No newline at end of file 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 ccc71c75..25e1cf1a 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 @@ -13,7 +13,7 @@ class MessageListActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) + setContentView(R.layout.messages_fragment) val threadId = intent.getLongExtra("thread_id", 0) @@ -24,7 +24,7 @@ class MessageListActivity : AppCompatActivity() { .equalTo("threadId", threadId) .findAll() - val messages = findViewById(R.id.conversation_list) as RecyclerView + val messages = findViewById(R.id.message_list) as RecyclerView messages.layoutManager = LinearLayoutManager(this) messages.adapter = MessageAdapter(this, realmResults) } diff --git a/qksms/src/main/res/layout/activity_main.xml b/qksms/src/main/res/layout/activity_main.xml index dc58a8c1..b862a620 100644 --- a/qksms/src/main/res/layout/activity_main.xml +++ b/qksms/src/main/res/layout/activity_main.xml @@ -1,14 +1,13 @@ - - - + diff --git a/qksms/src/main/res/layout/conversations_fragment.xml b/qksms/src/main/res/layout/conversations_fragment.xml new file mode 100644 index 00000000..030edb51 --- /dev/null +++ b/qksms/src/main/res/layout/conversations_fragment.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/messages_fragment.xml b/qksms/src/main/res/layout/messages_fragment.xml new file mode 100644 index 00000000..2fd3fe27 --- /dev/null +++ b/qksms/src/main/res/layout/messages_fragment.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file