Skip to content

Fix media review confirm button color #14683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bushwicknative wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −20
Open

Fix media review confirm button color #14683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package org.thoughtcrime.securesms.mediasend.v2.review

import android.content.DialogInterface
import android.content.res.ColorStateList
import android.os.Bundle
import android.view.ContextThemeWrapper
import android.view.KeyEvent
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.view.ViewCompat
import androidx.core.widget.addTextChangedListener
import androidx.fragment.app.FragmentManager
import androidx.fragment.app.viewModels
Expand Down Expand Up @@ -226,6 +228,9 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a

Recipient.live(recipientId).observe(viewLifecycleOwner) { recipient ->
this.recipient = recipient

val confirmButton = requireView().findViewById<View>(R.id.confirm_button)
ViewCompat.setBackgroundTintList(confirmButton, ColorStateList.valueOf(recipient.chatColors.asSingleColor()))
mentionsViewModel.onRecipientChange(recipient)

binding.content.addAMessageInput.setMentionValidator { annotations ->
Expand Down
17 changes: 0 additions & 17 deletions app/src/main/res/drawable/v2_media_add_a_message_check.xml
View file
Open in desktop

This file was deleted.

9 changes: 6 additions & 3 deletions app/src/main/res/layout/v2_media_add_message_dialog_fragment_content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,18 +110,21 @@
tools:text="50"
tools:visibility="visible" />

<androidx.appcompat.widget.AppCompatImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/confirm_button"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="2dp"
android:padding="6dp"
android:background="@color/signal_colorSecondaryContainer"
android:contentDescription="@string/MediaReviewFragment__finish_adding_a_message_accessibility_label"
android:padding="6dp"
android:scaleType="centerInside"
app:layout_constraintBottom_toTopOf="@id/emoji_drawer_stub"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/input_barrier"
app:srcCompat="@drawable/v2_media_add_a_message_check" />
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.Circle"
app:srcCompat="@drawable/symbol_check_white_24" />

<ViewStub
android:id="@+id/emoji_drawer_stub"
Expand Down
Loading