forked from upstream-mirrors/quik
Flatten send icon
This commit is contained in:
@@ -147,7 +147,7 @@ class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
|
|||||||
ColorStateList(states, intArrayOf(primary, tertiary))
|
ColorStateList(states, intArrayOf(primary, tertiary))
|
||||||
})
|
})
|
||||||
.autoDisposable(scope())
|
.autoDisposable(scope())
|
||||||
.subscribe { tintList -> sendIcon.imageTintList = tintList }
|
.subscribe { tintList -> send.imageTintList = tintList }
|
||||||
|
|
||||||
theme
|
theme
|
||||||
.autoDisposable(scope())
|
.autoDisposable(scope())
|
||||||
@@ -231,7 +231,6 @@ class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
|
|||||||
counter.setVisible(counter.text.isNotBlank())
|
counter.setVisible(counter.text.isNotBlank())
|
||||||
|
|
||||||
send.isEnabled = state.canSend
|
send.isEnabled = state.canSend
|
||||||
sendIcon.isEnabled = state.canSend
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun setDraft(draft: String) {
|
override fun setDraft(draft: String) {
|
||||||
|
|||||||
@@ -186,7 +186,7 @@
|
|||||||
app:textColor="secondary"
|
app:textColor="secondary"
|
||||||
tools:text="108 / 2" />
|
tools:text="108 / 2" />
|
||||||
|
|
||||||
<FrameLayout
|
<ImageView
|
||||||
android:id="@+id/send"
|
android:id="@+id/send"
|
||||||
android:layout_width="44dp"
|
android:layout_width="44dp"
|
||||||
android:layout_height="44dp"
|
android:layout_height="44dp"
|
||||||
@@ -194,19 +194,12 @@
|
|||||||
android:layout_marginEnd="8dp"
|
android:layout_marginEnd="8dp"
|
||||||
android:background="@drawable/circle"
|
android:background="@drawable/circle"
|
||||||
android:elevation="4dp"
|
android:elevation="4dp"
|
||||||
|
android:padding="10dp"
|
||||||
|
android:src="@drawable/ic_send_black_24dp"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
tools:backgroundTint="@color/tools_theme">
|
tools:backgroundTint="@color/tools_theme"
|
||||||
|
tools:tint="@color/textPrimaryDark" />
|
||||||
<ImageView
|
|
||||||
android:id="@+id/sendIcon"
|
|
||||||
android:layout_width="24dp"
|
|
||||||
android:layout_height="24dp"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:src="@drawable/ic_send_black_24dp"
|
|
||||||
tools:tint="@color/textPrimaryDark" />
|
|
||||||
|
|
||||||
</FrameLayout>
|
|
||||||
|
|
||||||
<View
|
<View
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
|||||||
Reference in New Issue
Block a user