empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix background of sticker management row item.

Browse source
This commit is contained in:
Alex Hart 2022-05-27 14:18:03 -03:00 • committed by Greyson Parrelli
parent e10e629d13
commit 4758369f79
3 changed files with 35 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/res/drawable-night-v21/selectable_background.xml
View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/transparent_white_20">
<item android:id="@+id/mask">
<shape>
<solid android:color="@color/transparent_black" />
</shape>
</item>
<item>
<shape android:shape="rectangle" >
<solid android:color="@color/core_grey_95"/>
</shape>
</item>
</ripple>

17
app/src/main/res/drawable-v21/selectable_background.xml
View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/transparent_black_20">
<item android:id="@+id/mask">
<shape>
<solid android:color="@color/transparent_black" />
</shape>
</item>
<item>
<shape android:shape="rectangle" >
<solid android:color="@color/core_white"/>
</shape>
</item>
</ripple>

61
app/src/main/res/layout/sticker_management_sticker_item.xml
View file

@ -1,47 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:paddingStart="@dimen/sticker_management_horizontal_margin"
android:paddingEnd="@dimen/sticker_management_horizontal_margin"
android:background="@drawable/selectable_background">
android:background="?colorSurface">
<View
android:id="@+id/background"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="?selectableItemBackground"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/sticker_management_cover"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginStart="@dimen/sticker_management_horizontal_margin"
app:layout_constraintBottom_toTopOf="@id/sticker_management_divider"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/sticker_management_divider"
tools:src="@drawable/ic_person_white_24dp"
tools:tint="@color/core_ultramarine"/>
tools:tint="@color/core_ultramarine" />
<LinearLayout
android:id="@+id/sticker_management_title_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginEnd="4dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
android:orientation="vertical"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/sticker_management_divider"
app:layout_constraintEnd_toStartOf="@id/sticker_management_button_barrier"
app:layout_constraintStart_toEndOf="@id/sticker_management_cover"
app:layout_constraintEnd_toStartOf="@id/sticker_management_button_barrier">
app:layout_constraintTop_toTopOf="parent">
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/sticker_management_title"
style="@style/Signal.Text.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Signal.Text.Body"
android:ellipsize="end"
app:emoji_maxLength="45"
tools:text="Spider-Man"/>
tools:text="Spider-Man" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/sticker_management_author"
@ -60,7 +68,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
app:barrierDirection="start"
app:constraint_referenced_ids="sticker_management_action_button,sticker_management_share_button"/>
app:constraint_referenced_ids="sticker_management_action_button,sticker_management_share_button" />
<View
android:id="@+id/sticker_management_share_button"
@ -68,48 +76,49 @@
android:layout_height="40dp"
android:layout_marginEnd="4dp"
android:background="@drawable/sticker_button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/sticker_management_action_button"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/sticker_management_share_button_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tint="@color/sticker_management_action_button_color"
app:srcCompat="@drawable/ic_forward_24"
app:layout_constraintTop_toTopOf="@id/sticker_management_share_button"
app:layout_constraintBottom_toBottomOf="@id/sticker_management_share_button"
app:layout_constraintEnd_toEndOf="@id/sticker_management_share_button"
app:layout_constraintStart_toStartOf="@id/sticker_management_share_button"
app:layout_constraintEnd_toEndOf="@id/sticker_management_share_button"/>
app:layout_constraintTop_toTopOf="@id/sticker_management_share_button"
app:srcCompat="@drawable/ic_forward_24" />
<View
android:id="@+id/sticker_management_action_button"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginEnd="@dimen/sticker_management_horizontal_margin"
android:background="@drawable/sticker_button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/sticker_management_action_button_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tint="@color/sticker_management_action_button_color"
tools:src="@drawable/ic_arrow_down"
app:layout_constraintTop_toTopOf="@id/sticker_management_action_button"
app:layout_constraintBottom_toBottomOf="@id/sticker_management_action_button"
app:layout_constraintEnd_toEndOf="@id/sticker_management_action_button"
app:layout_constraintStart_toStartOf="@id/sticker_management_action_button"
app:layout_constraintEnd_toEndOf="@id/sticker_management_action_button"/>
app:layout_constraintTop_toTopOf="@id/sticker_management_action_button"
tools:src="@drawable/ic_arrow_down" />
<View
android:id="@+id/sticker_management_divider"
android:layout_width="0dp"
android:layout_height="1dp"
android:background="@color/signal_divider_minor"
app:layout_constraintStart_toStartOf="@id/sticker_management_title_container"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/sticker_management_title_container" />
</androidx.constraintlayout.widget.ConstraintLayout>