Commit 810a812e authored by Lucio Maciel's avatar Lucio Maciel

Use AppCompat for Activity and Fragments

parent f7f0277f
package chat.rocket.android.app package chat.rocket.android.app
import android.os.Bundle import android.os.Bundle
import chat.rocket.android.BaseActivity import android.support.v7.app.AppCompatActivity
import chat.rocket.android.R import chat.rocket.android.R
import chat.rocket.android.app.chatroom.MessageFragment import chat.rocket.android.app.chatroom.MessageFragment
import chat.rocket.android.util.addFragment
class ChatRoomActivity : BaseActivity() { class ChatRoomActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_chat_room) setContentView(R.layout.activity_chat_room)
addFragment(MessageFragment(), "MessageFragment", R.id.fragment_container) addFragment("MessageFragment", R.id.fragment_container) {
MessageFragment()
}
} }
} }
\ No newline at end of file
package chat.rocket.android.app.chatroom package chat.rocket.android.app.chatroom
import android.app.Fragment
import android.os.Bundle import android.os.Bundle
import android.support.v4.app.Fragment
import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.LinearLayoutManager
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
...@@ -13,9 +13,9 @@ import org.threeten.bp.LocalDateTime ...@@ -13,9 +13,9 @@ import org.threeten.bp.LocalDateTime
class MessageFragment : Fragment() { class MessageFragment : Fragment() {
override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? = inflater?.inflate(R.layout.fragment_message, container, false) override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? = inflater.inflate(R.layout.fragment_message, container, false)
override fun onViewCreated(view: View?, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
showMessageList(createDumpData()) showMessageList(createDumpData())
} }
...@@ -32,7 +32,9 @@ class MessageFragment : Fragment() { ...@@ -32,7 +32,9 @@ class MessageFragment : Fragment() {
// REMARK: The presenter should call this method. // REMARK: The presenter should call this method.
private fun showMessageList(dataSet: List<Message>) { private fun showMessageList(dataSet: List<Message>) {
recycler_view.layoutManager = LinearLayoutManager(activity.applicationContext, LinearLayoutManager.VERTICAL, false) activity?.apply {
recycler_view.adapter = MessageListAdapter(dataSet.toMutableList()) recycler_view.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
recycler_view.adapter = MessageListAdapter(dataSet.toMutableList())
}
} }
} }
\ No newline at end of file
...@@ -4,7 +4,7 @@ import chat.rocket.android.server.domain.model.Server ...@@ -4,7 +4,7 @@ import chat.rocket.android.server.domain.model.Server
import chat.rocket.android.util.DataToDomain import chat.rocket.android.util.DataToDomain
class ServerEntityMapper : DataToDomain<ServerEntity, Server> { class ServerEntityMapper : DataToDomain<ServerEntity, Server> {
override fun translate(serverEntity: ServerEntity): Server { override fun translate(data: ServerEntity): Server {
return Server(serverEntity.id, serverEntity.name, serverEntity.host, serverEntity.avatar) return Server(data.id, data.name, data.host, data.avatar)
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment