Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-21 02:08:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix baby emoji in Help and Profile.

Browse Source
This commit is contained in:
Cody Henthorne
2021-06-21 10:54:55 -04:00
parent b427754a81
commit 426c83c6cc
4 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/layout/about_preset_item.xml
View File

@@ -9,9 +9,10 @@
<ImageView
android:id="@+id/about_preset_emoji"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="24dp"
android:scaleType="fitCenter"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/about_preset_body"
app:layout_constraintBottom_toBottomOf="@id/about_preset_body"

11
app/src/main/res/layout/edit_about_fragment.xml
View File

@@ -17,13 +17,14 @@
app:navigationIcon="@drawable/ic_arrow_left_24"
app:title="@string/EditAboutFragment_about" />
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/edit_about_emoji"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="10dp"
android:padding="15dp"
android:padding="8dp"
android:background="?selectableItemBackgroundBorderless"
android:scaleType="fitCenter"
app:srcCompat="@drawable/ic_add_emoji"
app:tint="@color/signal_text_secondary"
app:layout_constraintTop_toTopOf="@id/edit_about_body"
@@ -46,7 +47,7 @@
app:layout_constraintEnd_toStartOf="@id/edit_about_clear"
app:emoji_forceCustom="true"/>
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/edit_about_clear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

15
app/src/main/res/layout/help_fragment.xml
View File

@@ -102,7 +102,8 @@
android:background="@drawable/help_fragment_emoji_radio_background"
android:button="@null"
android:gravity="center"
android:scaleType="centerInside"
android:padding="4dp"
android:scaleType="fitCenter"
app:layout_constraintEnd_toStartOf="@id/help_fragment_emoji_4"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintHorizontal_chainStyle="packed"
@@ -117,7 +118,8 @@
android:background="@drawable/help_fragment_emoji_radio_background"
android:button="@null"
android:gravity="center"
android:scaleType="centerInside"
android:scaleType="fitCenter"
android:padding="4dp"
app:layout_constraintBottom_toBottomOf="@id/help_fragment_emoji_5"
app:layout_constraintEnd_toStartOf="@id/help_fragment_emoji_3"
app:layout_constraintStart_toEndOf="@id/help_fragment_emoji_5"
@@ -131,7 +133,8 @@
android:background="@drawable/help_fragment_emoji_radio_background"
android:button="@null"
android:gravity="center"
android:scaleType="centerInside"
android:scaleType="fitCenter"
android:padding="4dp"
app:layout_constraintBottom_toBottomOf="@id/help_fragment_emoji_4"
app:layout_constraintEnd_toStartOf="@id/help_fragment_emoji_2"
app:layout_constraintStart_toEndOf="@id/help_fragment_emoji_4"
@@ -145,7 +148,8 @@
android:background="@drawable/help_fragment_emoji_radio_background"
android:button="@null"
android:gravity="center"
android:scaleType="centerInside"
android:scaleType="fitCenter"
android:padding="4dp"
app:layout_constraintBottom_toBottomOf="@id/help_fragment_emoji_3"
app:layout_constraintEnd_toStartOf="@id/help_fragment_emoji_1"
app:layout_constraintStart_toEndOf="@id/help_fragment_emoji_3"
@@ -159,7 +163,8 @@
android:background="@drawable/help_fragment_emoji_radio_background"
android:button="@null"
android:gravity="center"
android:scaleType="centerInside"
android:scaleType="fitCenter"
android:padding="4dp"
app:layout_constraintBottom_toBottomOf="@id/help_fragment_emoji_2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/help_fragment_emoji_2"

7
app/src/main/res/layout/manage_profile_fragment.xml
View File

@@ -173,10 +173,11 @@
android:background="?selectableItemBackground"
app:layout_constraintTop_toBottomOf="@id/manage_profile_username_container">
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/manage_profile_about_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="24dp"
android:layout_height="24dp"
android:scaleType="fitCenter"
app:srcCompat="@drawable/ic_compose_24"
app:tint="@color/signal_text_primary"
app:layout_constraintTop_toTopOf="@id/manage_profile_about"