forked from upstream-mirrors/quik
rebased to master.
moved send now button to rhs. changed send now button long press to short/normal press
This commit is contained in:
@@ -236,7 +236,7 @@ class MessagesAdapter @Inject constructor(
|
|||||||
holder.sendNowIcon.let { sendNowIcon ->
|
holder.sendNowIcon.let { sendNowIcon ->
|
||||||
val isCancellable = message.isSending() && message.date > System.currentTimeMillis()
|
val isCancellable = message.isSending() && message.date > System.currentTimeMillis()
|
||||||
sendNowIcon.visibility = if (isCancellable) View.VISIBLE else View.GONE
|
sendNowIcon.visibility = if (isCancellable) View.VISIBLE else View.GONE
|
||||||
sendNowIcon.longClicks().subscribe { sendNow.onNext(message.id) }
|
sendNowIcon.clicks().subscribe { sendNow.onNext(message.id) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -138,17 +138,6 @@
|
|||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_weight="1" />
|
android:layout_weight="1" />
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/sendNowIcon"
|
|
||||||
android:layout_width="36dp"
|
|
||||||
android:layout_height="36dp"
|
|
||||||
android:background="@drawable/circle"
|
|
||||||
android:contentDescription="@string/compose_message_send_now"
|
|
||||||
android:elevation="4dp"
|
|
||||||
android:padding="6dp"
|
|
||||||
android:src="@drawable/ic_send_black_24dp"
|
|
||||||
tools:tint="@color/tools_theme" />
|
|
||||||
|
|
||||||
<dev.octoshrimpy.quik.common.widget.TightTextView
|
<dev.octoshrimpy.quik.common.widget.TightTextView
|
||||||
android:id="@+id/body"
|
android:id="@+id/body"
|
||||||
style="@style/TextPrimary"
|
style="@style/TextPrimary"
|
||||||
@@ -165,6 +154,18 @@
|
|||||||
android:textIsSelectable="true"
|
android:textIsSelectable="true"
|
||||||
app:layout_constrainedWidth="true"
|
app:layout_constrainedWidth="true"
|
||||||
tools:text="Hey! How's it going?" />
|
tools:text="Hey! How's it going?" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/sendNowIcon"
|
||||||
|
android:layout_width="36dp"
|
||||||
|
android:layout_height="36dp"
|
||||||
|
android:layout_marginEnd="12dp"
|
||||||
|
android:background="@drawable/circle"
|
||||||
|
android:contentDescription="@string/compose_message_send_now"
|
||||||
|
android:elevation="4dp"
|
||||||
|
android:padding="6dp"
|
||||||
|
android:src="@drawable/ic_send_black_24dp"
|
||||||
|
tools:tint="@color/tools_theme" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<dev.octoshrimpy.quik.common.widget.QkTextView
|
<dev.octoshrimpy.quik.common.widget.QkTextView
|
||||||
|
|||||||
Reference in New Issue
Block a user