From a96f3051ca2efb1d55bc31252636c13eb3e98521 Mon Sep 17 00:00:00 2001 From: hmalik144 Date: Wed, 16 Sep 2020 16:13:49 +0100 Subject: [PATCH] Final commit --- .../com/example/h_mal/messengerapp/application/AppClass.kt | 1 + .../com/example/h_mal/messengerapp/ui/main/MainFragment.kt | 4 +++- .../h_mal/messengerapp/ui/main/MessageRecyclerAdapter.kt | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/h_mal/messengerapp/application/AppClass.kt b/app/src/main/java/com/example/h_mal/messengerapp/application/AppClass.kt index 86d9602..0dafba4 100644 --- a/app/src/main/java/com/example/h_mal/messengerapp/application/AppClass.kt +++ b/app/src/main/java/com/example/h_mal/messengerapp/application/AppClass.kt @@ -19,6 +19,7 @@ import org.kodein.di.generic.singleton class AppClass: Application(), KodeinAware{ // Kodein aware to initialise the classes used for DI + // Simple DI module creation where @instance() automatically becomes required class (eg. context or singleton) @ExperimentalCoroutinesApi override val kodein = Kodein.lazy { import(androidXModule(this@AppClass)) diff --git a/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MainFragment.kt b/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MainFragment.kt index b643cfc..cc3fc77 100644 --- a/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MainFragment.kt +++ b/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MainFragment.kt @@ -8,6 +8,7 @@ import android.view.ViewGroup import android.view.inputmethod.EditorInfo import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.example.h_mal.messengerapp.R @@ -64,11 +65,11 @@ class MainFragment : Fragment(), KodeinAware { } }) } - } message_box_et.apply { setOnEditorActionListener { _, actionId, _ -> + // Press enter to send message when (actionId) { EditorInfo.IME_ACTION_DONE ->{ viewModel.submitMessage(text.toString()) @@ -79,6 +80,7 @@ class MainFragment : Fragment(), KodeinAware { } submit.setOnClickListener { + // send message on submit viewModel.submitMessage(text.toString()) text.clear() } diff --git a/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MessageRecyclerAdapter.kt b/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MessageRecyclerAdapter.kt index ece4e35..13ded98 100644 --- a/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MessageRecyclerAdapter.kt +++ b/app/src/main/java/com/example/h_mal/messengerapp/ui/main/MessageRecyclerAdapter.kt @@ -18,7 +18,7 @@ const val SENT_CONST = 101 const val RECEIVED_CONST = 102 const val TIMESTAMP_CONST = 103 class MessageRecyclerAdapter( - val messageLiveData: LiveData> + messageLiveData: LiveData> ) : RecyclerView.Adapter() { var messages: List? = null