kopia lustrzana https://github.com/ryukoposting/Signal-Android
Make next/continue buttons in send flow more consistent.
rodzic
a50e49e4e6
commit
c77718f4c7
|
@ -291,7 +291,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment) {
|
||||||
|
|
||||||
private fun presentSendButton(sendType: MessageSendType) {
|
private fun presentSendButton(sendType: MessageSendType) {
|
||||||
val sendButtonTint = if (sendType.usesSignalTransport) {
|
val sendButtonTint = if (sendType.usesSignalTransport) {
|
||||||
R.color.core_ultramarine
|
R.color.signal_colorSecondaryContainer
|
||||||
} else {
|
} else {
|
||||||
R.color.core_grey_50
|
R.color.core_grey_50
|
||||||
}
|
}
|
||||||
|
|
|
@ -82,8 +82,9 @@
|
||||||
android:background="@drawable/circle_tintable"
|
android:background="@drawable/circle_tintable"
|
||||||
android:contentDescription="@string/ShareActivity__share"
|
android:contentDescription="@string/ShareActivity__share"
|
||||||
android:scaleType="centerInside"
|
android:scaleType="centerInside"
|
||||||
app:backgroundTint="@color/signal_accent_primary"
|
app:backgroundTint="@color/signal_colorSecondaryContainer"
|
||||||
app:srcCompat="@drawable/ic_send_24" />
|
app:srcCompat="@drawable/ic_send_24"
|
||||||
|
app:tint="@color/signal_colorOnSecondaryContainer" />
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
||||||
|
|
|
@ -75,19 +75,20 @@
|
||||||
app:srcCompat="@drawable/ic_link_24"
|
app:srcCompat="@drawable/ic_link_24"
|
||||||
app:tint="@color/core_white" />
|
app:tint="@color/core_white" />
|
||||||
|
|
||||||
<androidx.appcompat.widget.AppCompatImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
android:id="@+id/send"
|
android:id="@+id/send"
|
||||||
android:layout_width="48dp"
|
android:layout_width="48dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="48dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@drawable/story_text_circle_button_background_inset_5"
|
android:background="@color/signal_colorSecondaryContainer"
|
||||||
|
android:padding="4dp"
|
||||||
android:scaleType="centerInside"
|
android:scaleType="centerInside"
|
||||||
app:backgroundTint="@color/core_ultramarine"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@id/toggle_spacer"
|
app:layout_constraintBottom_toBottomOf="@id/toggle_spacer"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="@id/toggle_spacer"
|
app:layout_constraintTop_toTopOf="@id/toggle_spacer"
|
||||||
|
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.Circle"
|
||||||
app:srcCompat="@drawable/ic_arrow_end_24"
|
app:srcCompat="@drawable/ic_arrow_end_24"
|
||||||
app:tint="@color/core_white" />
|
app:tint="@color/signal_colorOnSecondaryContainer" />
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.Barrier
|
<androidx.constraintlayout.widget.Barrier
|
||||||
android:id="@+id/button_bar_barrier"
|
android:id="@+id/button_bar_barrier"
|
||||||
|
|
|
@ -70,14 +70,14 @@
|
||||||
android:layout_width="48dp"
|
android:layout_width="48dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="48dp"
|
||||||
android:layout_marginEnd="12dp"
|
android:layout_marginEnd="12dp"
|
||||||
android:background="@color/core_ultramarine"
|
android:background="@color/signal_colorSecondaryContainer"
|
||||||
android:padding="2dp"
|
android:padding="4dp"
|
||||||
android:scaleType="centerInside"
|
android:scaleType="centerInside"
|
||||||
app:layout_constraintBottom_toBottomOf="@id/input"
|
app:layout_constraintBottom_toBottomOf="@id/input"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="@id/input"
|
app:layout_constraintTop_toTopOf="@id/input"
|
||||||
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.Circle"
|
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.Circle"
|
||||||
app:srcCompat="@drawable/ic_check_24"
|
app:srcCompat="@drawable/ic_check_24"
|
||||||
app:tint="@color/core_white" />
|
app:tint="@color/signal_colorOnSecondaryContainer" />
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
@ -64,18 +64,21 @@
|
||||||
app:tint="@color/core_white"
|
app:tint="@color/core_white"
|
||||||
tools:srcCompat="@drawable/ic_text_effect" />
|
tools:srcCompat="@drawable/ic_text_effect" />
|
||||||
|
|
||||||
<ImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
android:id="@+id/confirm"
|
android:id="@+id/confirm"
|
||||||
android:layout_width="48dp"
|
android:layout_width="48dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="48dp"
|
||||||
android:layout_marginEnd="16dp"
|
android:layout_marginEnd="16dp"
|
||||||
|
android:background="@color/signal_colorSecondaryContainer"
|
||||||
android:contentDescription="@string/TextStoryPostTextEntryFragment__done_adding_text"
|
android:contentDescription="@string/TextStoryPostTextEntryFragment__done_adding_text"
|
||||||
android:padding="6dp"
|
android:padding="4dp"
|
||||||
android:scaleType="centerInside"
|
android:scaleType="centerInside"
|
||||||
app:layout_constraintBottom_toBottomOf="@id/color_bar"
|
app:layout_constraintBottom_toBottomOf="@id/color_bar"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="@id/color_bar"
|
app:layout_constraintTop_toTopOf="@id/color_bar"
|
||||||
app:srcCompat="@drawable/ic_done_button" />
|
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.Circle"
|
||||||
|
app:srcCompat="@drawable/ic_check_24"
|
||||||
|
app:tint="@color/signal_colorOnSecondaryContainer" />
|
||||||
|
|
||||||
<org.thoughtcrime.securesms.mediasend.v2.text.TextFontButton
|
<org.thoughtcrime.securesms.mediasend.v2.text.TextFontButton
|
||||||
android:id="@+id/font_button"
|
android:id="@+id/font_button"
|
||||||
|
|
|
@ -278,23 +278,25 @@
|
||||||
app:tint="@color/signal_dark_colorOnSurface"
|
app:tint="@color/signal_dark_colorOnSurface"
|
||||||
tools:translationY="0dp" />
|
tools:translationY="0dp" />
|
||||||
|
|
||||||
<androidx.appcompat.widget.AppCompatImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
android:id="@+id/send"
|
android:id="@+id/send"
|
||||||
android:layout_width="36dp"
|
android:layout_width="48dp"
|
||||||
android:layout_height="36dp"
|
android:layout_height="48dp"
|
||||||
android:layout_marginStart="12dp"
|
android:layout_marginStart="12dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:layout_marginBottom="22dp"
|
android:layout_marginBottom="16dp"
|
||||||
android:background="@drawable/circle_tintable"
|
android:background="@color/signal_colorSecondaryContainer"
|
||||||
android:padding="8dp"
|
android:padding="4dp"
|
||||||
|
android:scaleType="centerInside"
|
||||||
android:translationY="48dp"
|
android:translationY="48dp"
|
||||||
app:backgroundTint="@color/core_ultramarine"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintHorizontal_bias="1"
|
app:layout_constraintHorizontal_bias="1"
|
||||||
app:layout_constraintStart_toEndOf="@id/save_to_media"
|
app:layout_constraintStart_toEndOf="@id/save_to_media"
|
||||||
app:layout_goneMarginStart="10dp"
|
app:layout_goneMarginStart="10dp"
|
||||||
app:srcCompat="@drawable/ic_send_24"
|
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.Circle"
|
||||||
|
app:srcCompat="@drawable/ic_arrow_end_24"
|
||||||
|
app:tint="@color/signal_colorOnSecondaryContainer"
|
||||||
tools:translationY="0dp" />
|
tools:translationY="0dp" />
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
Ładowanie…
Reference in New Issue