From fe1e5262eb29ddff04503b1a0b25fbea9646447c Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 15 Apr 2018 16:00:23 -0400 Subject: [PATCH] Add empty state for messages --- .../java/feature/compose/ComposeActivity.kt | 1 + .../java/feature/compose/MessagesAdapter.kt | 4 +- .../src/main/res/layout/compose_activity.xml | 64 +++++++++++-------- presentation/src/main/res/values/strings.xml | 1 + 4 files changed, 43 insertions(+), 27 deletions(-) diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/feature/compose/ComposeActivity.kt index 8dc72606..1bbafb2f 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/feature/compose/ComposeActivity.kt @@ -94,6 +94,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { val layoutManager = LinearLayoutManager(this).apply { stackFromEnd = true } messageAdapter.autoScrollToStart(messageList) + messageAdapter.emptyView = messagesEmpty messageAdapter.longClicks.subscribe { message -> AlertDialog.Builder(this) .setItems(R.array.message_options, { _, row -> diff --git a/presentation/src/main/java/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/feature/compose/MessagesAdapter.kt index 8ad88c33..61c16507 100644 --- a/presentation/src/main/java/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/feature/compose/MessagesAdapter.kt @@ -27,6 +27,7 @@ import android.view.View import android.view.ViewGroup import com.jakewharton.rxbinding2.view.RxView import com.moez.QKSMS.R +import common.base.QkRealmAdapter import common.base.QkViewHolder import common.util.Colors import common.util.DateFormatter @@ -38,7 +39,6 @@ import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.plusAssign import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import io.realm.RealmRecyclerViewAdapter import io.realm.RealmResults import kotlinx.android.synthetic.main.message_list_item_in.view.* import model.Conversation @@ -52,7 +52,7 @@ class MessagesAdapter @Inject constructor( private val context: Context, private val colors: Colors, private val dateFormatter: DateFormatter -) : RealmRecyclerViewAdapter(null, true) { +) : QkRealmAdapter() { companion object { private const val VIEW_TYPE_MESSAGE_IN = 0 diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml index 8bd3caed..cd678917 100644 --- a/presentation/src/main/res/layout/compose_activity.xml +++ b/presentation/src/main/res/layout/compose_activity.xml @@ -26,31 +26,6 @@ android:orientation="vertical" tools:background="@color/backgroundLight"> - - - - - - - - + + + + + + + + + + Optimizing database, this might take a minute… You: %s + This is the start of your conversation. Say something nice! Write a message… Sending…