mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-20 12:48:53 +01:00
Add support for displaying message subject
This commit is contained in:
+1
-1
@@ -45,7 +45,7 @@ dependencies {
|
|||||||
compile "android.arch.lifecycle:runtime:1.0.3"
|
compile "android.arch.lifecycle:runtime:1.0.3"
|
||||||
compile 'com.amplitude:android-sdk:2.16.0'
|
compile 'com.amplitude:android-sdk:2.16.0'
|
||||||
compile 'com.android.support:appcompat-v7:27.0.2'
|
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.android.support:design:27.0.2'
|
||||||
compile 'com.bugsnag:bugsnag-android:4.1.1'
|
compile 'com.bugsnag:bugsnag-android:4.1.1'
|
||||||
compile 'com.f2prateek.rx.preferences2:rx-preferences:2.0.0-RC3'
|
compile 'com.f2prateek.rx.preferences2:rx-preferences:2.0.0-RC3'
|
||||||
|
|||||||
@@ -113,14 +113,17 @@ class MessagesAdapter @Inject constructor(
|
|||||||
}
|
}
|
||||||
RxView.longClicks(view).subscribe { longClicks.onNext(message) }
|
RxView.longClicks(view).subscribe { longClicks.onNext(message) }
|
||||||
|
|
||||||
bindMmsPreview(view, position)
|
view.subject.text = message.subject
|
||||||
bindStatus(view, position)
|
view.subject.setVisible(view.subject.text.isNotBlank())
|
||||||
bindGrouping(view, position)
|
|
||||||
|
|
||||||
view.body.text = message.getText()
|
view.body.text = message.getText()
|
||||||
view.body.setVisible(message.isSms() || view.body.text.isNotEmpty() || message.parts.all { it.image == null })
|
view.body.setVisible(message.isSms() || view.body.text.isNotEmpty() || message.parts.all { it.image == null })
|
||||||
|
|
||||||
view.timestamp.text = dateFormatter.getMessageTimestamp(message.date)
|
view.timestamp.text = dateFormatter.getMessageTimestamp(message.date)
|
||||||
|
|
||||||
|
bindMmsPreview(view, position)
|
||||||
|
bindStatus(view, position)
|
||||||
|
bindGrouping(view, position)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun bindMmsPreview(view: View, position: Int) {
|
private fun bindMmsPreview(view: View, position: Int) {
|
||||||
|
|||||||
@@ -64,26 +64,50 @@
|
|||||||
android:id="@+id/mmsPreview"
|
android:id="@+id/mmsPreview"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:layout_constraintBottom_toTopOf="@id/body"
|
app:layout_constraintBottom_toTopOf="@id/subject"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintVertical_chainStyle="packed"
|
||||||
app:layout_constraintWidth_min="192dp" />
|
app:layout_constraintWidth_min="192dp" />
|
||||||
|
|
||||||
|
<presentation.common.widget.TightTextView
|
||||||
|
android:id="@+id/subject"
|
||||||
|
style="@style/TextPrimary"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginEnd="12dp"
|
||||||
|
android:layout_marginStart="12dp"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
|
android:gravity="start|center_vertical"
|
||||||
|
android:textStyle="bold"
|
||||||
|
app:layout_constrainedWidth="true"
|
||||||
|
app:layout_constraintBottom_toTopOf="@id/body"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/mmsPreview"
|
||||||
|
app:layout_goneMarginBottom="8dp"
|
||||||
|
app:textColor="primaryOnTheme"
|
||||||
|
tools:text="@tools:sample/lorem" />
|
||||||
|
|
||||||
<presentation.common.widget.TightTextView
|
<presentation.common.widget.TightTextView
|
||||||
android:id="@+id/body"
|
android:id="@+id/body"
|
||||||
style="@style/TextPrimary"
|
style="@style/TextPrimary"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
|
android:layout_marginEnd="12dp"
|
||||||
|
android:layout_marginStart="12dp"
|
||||||
android:autoLink="all"
|
android:autoLink="all"
|
||||||
android:gravity="start|center_vertical"
|
android:gravity="start|center_vertical"
|
||||||
android:paddingBottom="8dp"
|
app:layout_constrainedWidth="true"
|
||||||
android:paddingEnd="12dp"
|
|
||||||
android:paddingStart="12dp"
|
|
||||||
android:paddingTop="8dp"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/image"
|
app:layout_constraintTop_toBottomOf="@id/subject"
|
||||||
|
app:layout_goneMarginTop="8dp"
|
||||||
app:textColor="primaryOnTheme"
|
app:textColor="primaryOnTheme"
|
||||||
tools:text="@tools:sample/lorem" />
|
tools:text="@tools:sample/lorem" />
|
||||||
|
|
||||||
|
|||||||
@@ -58,26 +58,49 @@
|
|||||||
android:id="@+id/mmsPreview"
|
android:id="@+id/mmsPreview"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:layout_constraintBottom_toTopOf="@id/body"
|
app:layout_constraintBottom_toTopOf="@id/subject"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintVertical_chainStyle="packed"
|
||||||
app:layout_constraintWidth_min="192dp" />
|
app:layout_constraintWidth_min="192dp" />
|
||||||
|
|
||||||
|
<presentation.common.widget.TightTextView
|
||||||
|
android:id="@+id/subject"
|
||||||
|
style="@style/TextPrimary"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginEnd="12dp"
|
||||||
|
android:layout_marginStart="12dp"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
|
android:gravity="start|center_vertical"
|
||||||
|
android:textStyle="bold"
|
||||||
|
app:layout_constrainedWidth="true"
|
||||||
|
app:layout_constraintBottom_toTopOf="@id/body"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/mmsPreview"
|
||||||
|
app:layout_goneMarginBottom="8dp"
|
||||||
|
tools:text="Subject" />
|
||||||
|
|
||||||
<presentation.common.widget.TightTextView
|
<presentation.common.widget.TightTextView
|
||||||
android:id="@+id/body"
|
android:id="@+id/body"
|
||||||
style="@style/TextPrimary"
|
style="@style/TextPrimary"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
|
android:layout_marginEnd="12dp"
|
||||||
|
android:layout_marginStart="12dp"
|
||||||
android:autoLink="all"
|
android:autoLink="all"
|
||||||
android:gravity="start|center_vertical"
|
android:gravity="start|center_vertical"
|
||||||
android:paddingBottom="8dp"
|
app:layout_constrainedWidth="true"
|
||||||
android:paddingEnd="12dp"
|
|
||||||
android:paddingStart="12dp"
|
|
||||||
android:paddingTop="8dp"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/image"
|
app:layout_constraintTop_toBottomOf="@id/subject"
|
||||||
|
app:layout_goneMarginTop="8dp"
|
||||||
tools:text="Hey! How's it going?" />
|
tools:text="Hey! How's it going?" />
|
||||||
|
|
||||||
</android.support.constraint.ConstraintLayout>
|
</android.support.constraint.ConstraintLayout>
|
||||||
|
|||||||
Reference in New Issue
Block a user