diff --git a/qksms/build.gradle b/qksms/build.gradle index 19bd3cab..9b67191f 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -45,7 +45,7 @@ dependencies { compile "android.arch.lifecycle:runtime:1.0.3" compile 'com.amplitude:android-sdk:2.16.0' compile 'com.android.support:appcompat-v7:27.0.2' - compile 'com.android.support.constraint:constraint-layout:1.0.2' + compile 'com.android.support.constraint:constraint-layout:1.1.0-beta4' compile 'com.android.support:design:27.0.2' compile 'com.bugsnag:bugsnag-android:4.1.1' compile 'com.f2prateek.rx.preferences2:rx-preferences:2.0.0-RC3' diff --git a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt index 77d6432a..b2cc2eb6 100644 --- a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt +++ b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt @@ -113,14 +113,17 @@ class MessagesAdapter @Inject constructor( } RxView.longClicks(view).subscribe { longClicks.onNext(message) } - bindMmsPreview(view, position) - bindStatus(view, position) - bindGrouping(view, position) + view.subject.text = message.subject + view.subject.setVisible(view.subject.text.isNotBlank()) view.body.text = message.getText() view.body.setVisible(message.isSms() || view.body.text.isNotEmpty() || message.parts.all { it.image == null }) view.timestamp.text = dateFormatter.getMessageTimestamp(message.date) + + bindMmsPreview(view, position) + bindStatus(view, position) + bindGrouping(view, position) } private fun bindMmsPreview(view: View, position: Int) { diff --git a/qksms/src/main/res/layout/message_list_item_in.xml b/qksms/src/main/res/layout/message_list_item_in.xml index b8cef1de..2d25b77a 100644 --- a/qksms/src/main/res/layout/message_list_item_in.xml +++ b/qksms/src/main/res/layout/message_list_item_in.xml @@ -64,26 +64,50 @@ android:id="@+id/mmsPreview" android:layout_width="0dp" android:layout_height="wrap_content" - app:layout_constraintBottom_toTopOf="@id/body" + app:layout_constraintBottom_toTopOf="@id/subject" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_chainStyle="packed" app:layout_constraintWidth_min="192dp" /> + + diff --git a/qksms/src/main/res/layout/message_list_item_out.xml b/qksms/src/main/res/layout/message_list_item_out.xml index ac214e08..b6e0bdf0 100644 --- a/qksms/src/main/res/layout/message_list_item_out.xml +++ b/qksms/src/main/res/layout/message_list_item_out.xml @@ -58,26 +58,49 @@ android:id="@+id/mmsPreview" android:layout_width="0dp" android:layout_height="wrap_content" - app:layout_constraintBottom_toTopOf="@id/body" + app:layout_constraintBottom_toTopOf="@id/subject" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_chainStyle="packed" app:layout_constraintWidth_min="192dp" /> + +